Date: Fri, 9 Mar 2018 12:54:40 +0000 (UTC) From: "Carlos J. Puga Medina" <cpm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r463958 - in branches/2018Q1/www/chromium: . files Message-ID: <201803091254.w29CsewA065013@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cpm Date: Fri Mar 9 12:54:40 2018 New Revision: 463958 URL: https://svnweb.freebsd.org/changeset/ports/463958 Log: MFH: r463839 www/chromium: update to 64.0.3282.186 Changelog: https://chromium.googlesource.com/chromium/src/+log/63.0.3239.132..64.0.3282.186?pretty=fuller&n=10000 Security: https://vuxml.freebsd.org/freebsd/8e986b2b-1baa-11e8-a944-54ee754af08e.html Security: https://vuxml.freebsd.org/freebsd/abfc932e-1ba8-11e8-a944-54ee754af08e.html Approved by: ports-secteam (riggs) Added: branches/2018Q1/www/chromium/files/patch-chrome_browser_ssl_ssl_error_controller_client.cc - copied unchanged from r463839, head/www/chromium/files/patch-chrome_browser_ssl_ssl_error_controller_client.cc branches/2018Q1/www/chromium/files/patch-chrome_browser_ui_sad_tab.cc - copied unchanged from r463839, head/www/chromium/files/patch-chrome_browser_ui_sad_tab.cc branches/2018Q1/www/chromium/files/patch-chrome_browser_ui_views_frame_browser_non_client_frame_view_factory_views.cc - copied unchanged from r463839, head/www/chromium/files/patch-chrome_browser_ui_views_frame_browser_non_client_frame_view_factory_views.cc branches/2018Q1/www/chromium/files/patch-chrome_common_webui_url_constants.cc - copied unchanged from r463839, head/www/chromium/files/patch-chrome_common_webui_url_constants.cc branches/2018Q1/www/chromium/files/patch-chrome_common_webui_url_constants.h - copied unchanged from r463839, head/www/chromium/files/patch-chrome_common_webui_url_constants.h branches/2018Q1/www/chromium/files/patch-components_crash_core_common_BUILD.gn - copied unchanged from r463839, head/www/chromium/files/patch-components_crash_core_common_BUILD.gn branches/2018Q1/www/chromium/files/patch-content_gpu_BUILD.gn - copied unchanged from r463839, head/www/chromium/files/patch-content_gpu_BUILD.gn branches/2018Q1/www/chromium/files/patch-content_gpu_gpu_sandbox_hook_linux.cc - copied unchanged from r463839, head/www/chromium/files/patch-content_gpu_gpu_sandbox_hook_linux.cc branches/2018Q1/www/chromium/files/patch-services_device_hid_BUILD.gn - copied unchanged from r463839, head/www/chromium/files/patch-services_device_hid_BUILD.gn branches/2018Q1/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc - copied unchanged from r463839, head/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc branches/2018Q1/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.h - copied unchanged from r463839, head/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.h branches/2018Q1/www/chromium/files/patch-services_device_hid_hid__service.cc - copied unchanged from r463839, head/www/chromium/files/patch-services_device_hid_hid__service.cc branches/2018Q1/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc - copied unchanged from r463839, head/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc branches/2018Q1/www/chromium/files/patch-services_device_hid_hid__service__freebsd.h - copied unchanged from r463839, head/www/chromium/files/patch-services_device_hid_hid__service__freebsd.h branches/2018Q1/www/chromium/files/patch-services_service__manager_sandbox_BUILD.gn - copied unchanged from r463839, head/www/chromium/files/patch-services_service__manager_sandbox_BUILD.gn branches/2018Q1/www/chromium/files/patch-third__party_WebKit_Source_core_html_canvas_CanvasAsyncBlobCreator.cpp - copied unchanged from r463839, head/www/chromium/files/patch-third__party_WebKit_Source_core_html_canvas_CanvasAsyncBlobCreator.cpp branches/2018Q1/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontMetrics.cpp - copied unchanged from r463839, head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontMetrics.cpp branches/2018Q1/www/chromium/files/patch-third__party_pdfium_fxjs_JS_Define.cpp - copied unchanged from r463839, head/www/chromium/files/patch-third__party_pdfium_fxjs_JS_Define.cpp branches/2018Q1/www/chromium/files/patch-third__party_pdfium_fxjs_cjs_publicmethods.cpp - copied unchanged from r463839, head/www/chromium/files/patch-third__party_pdfium_fxjs_cjs_publicmethods.cpp Deleted: branches/2018Q1/www/chromium/files/patch-chrome_app_chrome__main__delegate.h branches/2018Q1/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__audio__private_webrtc__audio__private__api.cc branches/2018Q1/www/chromium/files/patch-chrome_browser_interstitials_chrome__controller__client.cc branches/2018Q1/www/chromium/files/patch-chrome_browser_ui_views_message__center_message__center__frame__view.cc branches/2018Q1/www/chromium/files/patch-chrome_common_url__constants.cc branches/2018Q1/www/chromium/files/patch-chrome_common_url__constants.h branches/2018Q1/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc branches/2018Q1/www/chromium/files/patch-content_child_child__process.cc branches/2018Q1/www/chromium/files/patch-content_child_child__process.h branches/2018Q1/www/chromium/files/patch-content_child_child__thread__impl.cc branches/2018Q1/www/chromium/files/patch-content_child_child__thread__impl.h branches/2018Q1/www/chromium/files/patch-content_common_child__process__messages.h branches/2018Q1/www/chromium/files/patch-device_hid_BUILD.gn branches/2018Q1/www/chromium/files/patch-device_hid_hid__connection__freebsd.cc branches/2018Q1/www/chromium/files/patch-device_hid_hid__connection__freebsd.h branches/2018Q1/www/chromium/files/patch-device_hid_hid__service.cc branches/2018Q1/www/chromium/files/patch-device_hid_hid__service__freebsd.cc branches/2018Q1/www/chromium/files/patch-device_hid_hid__service__freebsd.h branches/2018Q1/www/chromium/files/patch-device_media__transfer__protocol_media__transfer__protocol__daemon__client.h branches/2018Q1/www/chromium/files/patch-device_media__transfer__protocol_media__transfer__protocol__manager.h branches/2018Q1/www/chromium/files/patch-headless_lib_headless__content__main__delegate.cc branches/2018Q1/www/chromium/files/patch-headless_lib_headless__content__main__delegate.h branches/2018Q1/www/chromium/files/patch-ppapi_shared__impl_private_net__address__private__impl.cc branches/2018Q1/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_SimpleFontData.cpp branches/2018Q1/www/chromium/files/patch-third__party_ots_include_opentype-sanitiser.h branches/2018Q1/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_JS__Value.cpp branches/2018Q1/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp branches/2018Q1/www/chromium/files/patch-third__party_webrtc_p2p_base_port.cc branches/2018Q1/www/chromium/files/patch-third__party_webrtc_system__wrappers_source_atomic32__non__darwin__unix.cc branches/2018Q1/www/chromium/files/patch-ui_base_ime_input__method__factory.cc Modified: branches/2018Q1/www/chromium/Makefile branches/2018Q1/www/chromium/distinfo branches/2018Q1/www/chromium/files/patch-BUILD.gn branches/2018Q1/www/chromium/files/patch-base_files_memory_mapped_file_posix.cc branches/2018Q1/www/chromium/files/patch-base_process_process__metrics.h branches/2018Q1/www/chromium/files/patch-base_process_process__metrics__freebsd.cc branches/2018Q1/www/chromium/files/patch-build_config_BUILDCONFIG.gn branches/2018Q1/www/chromium/files/patch-build_config_compiler_BUILD.gn branches/2018Q1/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc branches/2018Q1/www/chromium/files/patch-chrome_app_generated__resources.grd branches/2018Q1/www/chromium/files/patch-chrome_browser_browser__resources.grd branches/2018Q1/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc branches/2018Q1/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc branches/2018Q1/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc branches/2018Q1/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h branches/2018Q1/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc branches/2018Q1/www/chromium/files/patch-chrome_browser_ui_views_profiles_avatar_button.cc branches/2018Q1/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc branches/2018Q1/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc branches/2018Q1/www/chromium/files/patch-chrome_common_chrome__switches.cc branches/2018Q1/www/chromium/files/patch-components_crash_content_app_BUILD.gn branches/2018Q1/www/chromium/files/patch-components_password__manager_core_browser_password_manager.cc branches/2018Q1/www/chromium/files/patch-components_policy_resources_policy__templates.json branches/2018Q1/www/chromium/files/patch-content_app_content__main__runner.cc branches/2018Q1/www/chromium/files/patch-content_browser_browser__main__loop.cc branches/2018Q1/www/chromium/files/patch-content_browser_renderer__host_render__message__filter.cc branches/2018Q1/www/chromium/files/patch-content_common_BUILD.gn branches/2018Q1/www/chromium/files/patch-content_gpu_gpu__main.cc branches/2018Q1/www/chromium/files/patch-content_ppapi_plugin_ppapi_plugin_main.cc branches/2018Q1/www/chromium/files/patch-content_public_test_browser__test__base.cc branches/2018Q1/www/chromium/files/patch-content_renderer_render__thread__impl.cc branches/2018Q1/www/chromium/files/patch-content_renderer_renderer_main.cc branches/2018Q1/www/chromium/files/patch-extensions_common_feature_switch.cc branches/2018Q1/www/chromium/files/patch-gpu_ipc_common_gpu_memory_buffer_support.cc branches/2018Q1/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc branches/2018Q1/www/chromium/files/patch-gpu_ipc_service_gpu__memory_buffer_factory.cc branches/2018Q1/www/chromium/files/patch-net_base_network__interfaces__freebsd.cc branches/2018Q1/www/chromium/files/patch-net_socket_udp__socket__posix.cc branches/2018Q1/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_BUILD.gn branches/2018Q1/www/chromium/files/patch-services_service__manager_public_cpp_standalone__service_standalone__service.cc branches/2018Q1/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp branches/2018Q1/www/chromium/files/patch-third__party_webrtc_rtc_base_physicalsocketserver.cc branches/2018Q1/www/chromium/files/patch-ui_base_dragdrop_os__exchange__data__provider__factory.cc branches/2018Q1/www/chromium/files/patch-ui_gl_gl_bindings_autogen_glx.cc branches/2018Q1/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc branches/2018Q1/www/chromium/files/patch-v8_src_globals.h branches/2018Q1/www/chromium/pkg-plist Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/www/chromium/Makefile ============================================================================== --- branches/2018Q1/www/chromium/Makefile Fri Mar 9 12:34:33 2018 (r463957) +++ branches/2018Q1/www/chromium/Makefile Fri Mar 9 12:54:40 2018 (r463958) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 63.0.3239.132 +PORTVERSION= 64.0.3282.186 CATEGORIES?= www MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -31,7 +31,8 @@ BUILD_DEPENDS+= gperf:devel/gperf \ .endif .if !defined(GN_ONLY) -LIB_DEPENDS= libspeechd.so:accessibility/speech-dispatcher \ +LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ + libspeechd.so:accessibility/speech-dispatcher \ libsnappy.so:archivers/snappy \ libFLAC.so:audio/flac \ libopus.so:audio/opus \ Modified: branches/2018Q1/www/chromium/distinfo ============================================================================== --- branches/2018Q1/www/chromium/distinfo Fri Mar 9 12:34:33 2018 (r463957) +++ branches/2018Q1/www/chromium/distinfo Fri Mar 9 12:54:40 2018 (r463958) @@ -1,5 +1,5 @@ -TIMESTAMP = 1515196732 -SHA256 (chromium-63.0.3239.132.tar.xz) = 84c46c2c42faaa102abe0647ee1213615a2522627124924c2741ddc2161b3d8d -SIZE (chromium-63.0.3239.132.tar.xz) = 534286424 -SHA256 (chromium-63.0.3239.132-testdata.tar.xz) = 3706e61b3473624dedea61730a6633d94e00fb3670ebdee97a9f73fbdf6bd672 -SIZE (chromium-63.0.3239.132-testdata.tar.xz) = 172896844 +TIMESTAMP = 1519947004 +SHA256 (chromium-64.0.3282.186.tar.xz) = 5fd0218759231ac00cc729235823592f6fd1e4a00ff64780a5fed7ab210f1860 +SIZE (chromium-64.0.3282.186.tar.xz) = 482247144 +SHA256 (chromium-64.0.3282.186-testdata.tar.xz) = edda88026371323a3515f6243c3ab35cc94a98527b0dd9afb057c9223987a913 +SIZE (chromium-64.0.3282.186-testdata.tar.xz) = 251883204 Modified: branches/2018Q1/www/chromium/files/patch-BUILD.gn ============================================================================== --- branches/2018Q1/www/chromium/files/patch-BUILD.gn Fri Mar 9 12:34:33 2018 (r463957) +++ branches/2018Q1/www/chromium/files/patch-BUILD.gn Fri Mar 9 12:54:40 2018 (r463958) @@ -1,15 +1,6 @@ ---- BUILD.gn.orig 2017-12-15 02:04:03.000000000 +0100 -+++ BUILD.gn 2017-12-25 04:12:31.425198000 +0100 -@@ -99,7 +99,7 @@ - ] - } - -- if (!is_ios && !is_android && !is_chromecast && !is_fuchsia) { -+ if (!is_ios && !is_android && !is_chromecast && !is_fuchsia && !is_bsd) { - deps += [ - "//chrome", - "//chrome/installer/zucchini:zucchini", -@@ -368,7 +368,7 @@ +--- BUILD.gn.orig 2018-02-24 16:25:08.000000000 +0100 ++++ BUILD.gn 2018-03-03 19:04:30.972689000 +0100 +@@ -361,7 +361,7 @@ } } @@ -18,7 +9,7 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -408,8 +408,6 @@ +@@ -406,8 +406,6 @@ "//net:disk_cache_memory_test", "//net:quic_client", "//net:quic_server", @@ -27,7 +18,7 @@ ] if (use_dbus) { -@@ -465,10 +463,6 @@ +@@ -464,10 +462,6 @@ "//chrome/test/chromedriver:chromedriver", "//chrome/test/chromedriver:chromedriver_tests", "//components/sync:run_sync_testserver", @@ -38,7 +29,7 @@ "//media/cast:generate_barcode_video", "//media/cast:generate_timecode_audio", "//net:crash_cache", -@@ -523,10 +517,6 @@ +@@ -522,10 +516,6 @@ "//mojo/edk/test:mojo_public_system_perftests", "//services/service_manager/public/cpp", "//testing/gmock:gmock_main", @@ -49,7 +40,7 @@ ] if (!is_android) { -@@ -594,7 +584,7 @@ +@@ -593,7 +583,7 @@ deps += [ "//chrome/installer/mini_installer:next_version_mini_installer" ] } @@ -58,7 +49,7 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -831,7 +821,6 @@ +@@ -835,7 +825,6 @@ "//ppapi/examples/video_decode", "//sandbox/linux:chrome_sandbox", "//sandbox/linux:sandbox_linux_unittests", @@ -67,7 +58,7 @@ # Blocked on https://github.com/catapult-project/catapult/issues/2297 #"//third_party/catapult/telemetry:bitmaptools", @@ -939,7 +928,7 @@ - data_deps += [ "//content/shell:content_shell_crash_service" ] + ] } - if (!is_win && !is_android) { @@ -84,13 +75,13 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1066,9 +1055,6 @@ - "//chrome/installer/mini_installer:mini_installer", - "//chrome/test:angle_perftests", - ] +@@ -1064,9 +1053,6 @@ + + if (is_win) { + data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] - } else { - data_deps += - [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } - } - } + if (is_win || is_android) { + data_deps += [ "//chrome/test:angle_perftests" ] Modified: branches/2018Q1/www/chromium/files/patch-base_files_memory_mapped_file_posix.cc ============================================================================== --- branches/2018Q1/www/chromium/files/patch-base_files_memory_mapped_file_posix.cc Fri Mar 9 12:34:33 2018 (r463957) +++ branches/2018Q1/www/chromium/files/patch-base_files_memory_mapped_file_posix.cc Fri Mar 9 12:54:40 2018 (r463958) @@ -1,11 +1,11 @@ ---- base/files/memory_mapped_file_posix.cc.orig 2017-08-02 18:42:44.932652000 +0200 -+++ base/files/memory_mapped_file_posix.cc 2017-08-02 18:42:59.362655000 +0200 -@@ -114,7 +114,7 @@ - - #if defined(OS_ANDROID) && __ANDROID_API__ < 21 +--- base/files/memory_mapped_file_posix.cc.orig 2018-02-24 16:25:08.000000000 +0100 ++++ base/files/memory_mapped_file_posix.cc 2018-03-03 19:01:12.448678000 +0100 +@@ -110,6 +110,8 @@ + // 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_MACOSX) -+#elif !defined(OS_MACOSX) && !defined(OS_BSD) - if (posix_fallocate(file_.GetPlatformFile(), region.offset, - region.size) != 0) { - DPLOG(ERROR) << "posix_fallocate " << file_.GetPlatformFile(); ++#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 Modified: branches/2018Q1/www/chromium/files/patch-base_process_process__metrics.h ============================================================================== --- branches/2018Q1/www/chromium/files/patch-base_process_process__metrics.h Fri Mar 9 12:34:33 2018 (r463957) +++ branches/2018Q1/www/chromium/files/patch-base_process_process__metrics.h Fri Mar 9 12:54:40 2018 (r463958) @@ -1,5 +1,5 @@ ---- base/process/process_metrics.h.orig 2017-12-23 20:56:16.823419000 +0100 -+++ base/process/process_metrics.h 2017-12-23 20:58:52.195249000 +0100 +--- base/process/process_metrics.h.orig 2018-02-24 16:25:08.000000000 +0100 ++++ base/process/process_metrics.h 2018-03-03 19:17:04.829273000 +0100 @@ -103,7 +103,7 @@ size_t image; }; @@ -72,3 +72,12 @@ int buffers = 0; int cached = 0; int active_anon = 0; +@@ -437,7 +437,7 @@ + #endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || + // defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_FUCHSIA) + +-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_AIX) || defined(OS_BSD) + // Parse the data found in /proc/<pid>/stat and return the sum of the + // CPU-related ticks. Returns -1 on parse error. + // Exposed for testing. Modified: branches/2018Q1/www/chromium/files/patch-base_process_process__metrics__freebsd.cc ============================================================================== --- branches/2018Q1/www/chromium/files/patch-base_process_process__metrics__freebsd.cc Fri Mar 9 12:34:33 2018 (r463957) +++ branches/2018Q1/www/chromium/files/patch-base_process_process__metrics__freebsd.cc Fri Mar 9 12:54:40 2018 (r463958) @@ -1,5 +1,5 @@ ---- base/process/process_metrics_freebsd.cc.orig 2018-01-04 21:05:38.000000000 +0100 -+++ base/process/process_metrics_freebsd.cc 2018-01-27 20:04:35.262483000 +0100 +--- base/process/process_metrics_freebsd.cc.orig 2018-02-24 16:25:08.000000000 +0100 ++++ base/process/process_metrics_freebsd.cc 2018-03-03 19:25:40.067505000 +0100 @@ -12,6 +12,10 @@ #include "base/macros.h" #include "base/memory/ptr_util.h" @@ -11,7 +11,19 @@ namespace base { ProcessMetrics::ProcessMetrics(ProcessHandle process) -@@ -118,6 +122,60 @@ +@@ -25,6 +29,11 @@ + return WrapUnique(new ProcessMetrics(process)); + } + ++bool GetVmStatInfo(VmStatInfo* vmstat) { ++ NOTIMPLEMENTED(); ++ return false; ++} ++ + size_t ProcessMetrics::GetPagefileUsage() const { + struct kinfo_proc info; + int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_ }; +@@ -118,6 +127,60 @@ pagesize = getpagesize(); return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); Modified: branches/2018Q1/www/chromium/files/patch-build_config_BUILDCONFIG.gn ============================================================================== --- branches/2018Q1/www/chromium/files/patch-build_config_BUILDCONFIG.gn Fri Mar 9 12:34:33 2018 (r463957) +++ branches/2018Q1/www/chromium/files/patch-build_config_BUILDCONFIG.gn Fri Mar 9 12:54:40 2018 (r463958) @@ -1,6 +1,6 @@ ---- build/config/BUILDCONFIG.gn.orig 2017-12-15 02:04:05.000000000 +0100 -+++ build/config/BUILDCONFIG.gn 2017-12-30 02:24:17.939908000 +0100 -@@ -131,13 +131,13 @@ +--- build/config/BUILDCONFIG.gn.orig 2018-02-24 16:25:08.000000000 +0100 ++++ build/config/BUILDCONFIG.gn 2018-03-03 19:33:34.562749000 +0100 +@@ -131,14 +131,14 @@ is_official_build = false # Whether we're a traditional desktop unix. @@ -11,12 +11,13 @@ # to configure warnings. is_clang = current_os == "mac" || current_os == "ios" || current_os == "chromeos" || -- current_os == "fuchsia" || current_os == "android" || -+ current_os == "fuchsia" || current_os == "android" || current_os == "bsd" || + current_os == "fuchsia" || current_os == "android" || +- current_os == "win" || ++ current_os == "win" || current_os == "bsd" || (current_os == "linux" && current_cpu != "s390x" && current_cpu != "s390" && current_cpu != "ppc64" && current_cpu != "ppc" && current_cpu != "mips" && current_cpu != "mips64") -@@ -190,8 +190,8 @@ +@@ -191,8 +191,8 @@ # TODO(dpranke): Add some sort of assert here that verifies that # no toolchain omitted host_toolchain from its toolchain_args(). @@ -27,16 +28,16 @@ # TODO(dpranke) - is_clang normally applies only to the target # build, and there is no way to indicate that you want to override # it for both the target build *and* the host build. Do we need to -@@ -229,7 +229,7 @@ - } else { - _default_toolchain = "//build/toolchain/android:android_$target_cpu" - } +@@ -226,7 +226,7 @@ + assert(host_os == "linux" || host_os == "mac", + "Android builds are only supported on Linux and Mac hosts.") + _default_toolchain = "//build/toolchain/android:android_clang_$target_cpu" -} else if (target_os == "chromeos" || target_os == "linux") { +} else if (target_os == "chromeos" || target_os == "linux" || target_os == "bsd") { # See comments in build/toolchain/cros/BUILD.gn about board compiles. if (is_clang) { _default_toolchain = "//build/toolchain/linux:clang_$target_cpu" -@@ -297,6 +297,7 @@ +@@ -296,6 +296,7 @@ is_nacl = false is_posix = false is_win = true @@ -44,7 +45,7 @@ } else if (current_os == "mac") { is_android = false is_chromeos = false -@@ -307,6 +308,7 @@ +@@ -306,6 +307,7 @@ is_nacl = false is_posix = true is_win = false @@ -52,7 +53,7 @@ } else if (current_os == "android") { is_android = true is_chromeos = false -@@ -317,6 +319,7 @@ +@@ -316,6 +318,7 @@ is_nacl = false is_posix = true is_win = false @@ -60,7 +61,7 @@ } else if (current_os == "chromeos") { is_android = false is_chromeos = true -@@ -327,6 +330,7 @@ +@@ -326,6 +329,7 @@ is_nacl = false is_posix = true is_win = false @@ -68,7 +69,7 @@ } else if (current_os == "nacl") { # current_os == "nacl" will be passed by the nacl toolchain definition. # It is not set by default or on the command line. We treat is as a -@@ -340,6 +344,7 @@ +@@ -339,6 +343,7 @@ is_nacl = true is_posix = true is_win = false @@ -76,7 +77,7 @@ } else if (current_os == "fuchsia") { is_android = false is_chromeos = false -@@ -350,6 +355,7 @@ +@@ -349,6 +354,7 @@ is_nacl = false is_posix = true is_win = false @@ -84,7 +85,7 @@ } else if (current_os == "ios") { is_android = false is_chromeos = false -@@ -360,6 +366,7 @@ +@@ -359,6 +365,7 @@ is_nacl = false is_posix = true is_win = false @@ -92,7 +93,7 @@ } else if (current_os == "linux") { is_android = false is_chromeos = false -@@ -370,6 +377,7 @@ +@@ -369,6 +376,7 @@ is_nacl = false is_posix = true is_win = false @@ -100,7 +101,7 @@ } else if (current_os == "aix") { is_android = false is_chromeos = false -@@ -379,8 +387,20 @@ +@@ -378,6 +386,18 @@ is_nacl = false is_posix = true is_win = false @@ -111,14 +112,11 @@ + is_fuchsia = false + is_ios = false + is_linux = true -+ is_bsd = true + is_mac = false + is_nacl = false + is_posix = true + is_win = false + is_bsd = true } -- - # ============================================================================= - # SOURCES FILTERS + # ============================================================================= Modified: branches/2018Q1/www/chromium/files/patch-build_config_compiler_BUILD.gn ============================================================================== --- branches/2018Q1/www/chromium/files/patch-build_config_compiler_BUILD.gn Fri Mar 9 12:34:33 2018 (r463957) +++ branches/2018Q1/www/chromium/files/patch-build_config_compiler_BUILD.gn Fri Mar 9 12:54:40 2018 (r463958) @@ -1,6 +1,6 @@ ---- build/config/compiler/BUILD.gn.orig 2018-01-04 21:05:38.000000000 +0100 -+++ build/config/compiler/BUILD.gn 2018-01-20 16:53:24.701867000 +0100 -@@ -47,7 +47,7 @@ +--- build/config/compiler/BUILD.gn.orig 2018-02-24 16:25:08.000000000 +0100 ++++ build/config/compiler/BUILD.gn 2018-03-03 19:36:38.111753000 +0100 +@@ -48,7 +48,7 @@ # only two architectures that are currently checked in). Turn this off when # you are using a custom toolchain and need to control -B in cflags. linux_use_bundled_binutils = @@ -9,7 +9,7 @@ (current_cpu == "x64" || current_cpu == "x86") binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin", root_build_dir) -@@ -222,7 +222,7 @@ +@@ -223,7 +223,7 @@ # 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 -@@ -326,8 +326,6 @@ +@@ -327,8 +327,6 @@ "-Wl,-z,relro", ] if (!using_sanitizer) { @@ -27,7 +27,7 @@ # Functions interposed by the sanitizers can make ld think # that some libraries aren't needed when they actually are, # http://crbug.com/234010. As workaround, disable --as-needed. -@@ -424,7 +422,7 @@ +@@ -425,7 +423,7 @@ # TODO(hans): Remove this once Clang generates better optimized debug info by # default. https://crbug.com/765793 if (is_clang && !is_nacl && current_toolchain == host_toolchain && @@ -36,7 +36,7 @@ cflags += [ "-Xclang", "-mllvm", -@@ -638,7 +636,7 @@ +@@ -622,7 +620,7 @@ cflags += [ "-mtune=$arm_tune" ] } } else if (current_cpu == "arm64") { @@ -45,7 +45,7 @@ cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1261,23 +1259,8 @@ +@@ -1280,27 +1278,8 @@ # TODO(hans): https://crbug.com/637306 "-Wno-address-of-packed-member", @@ -65,11 +65,15 @@ - "-Wno-null-pointer-arithmetic", - - # TODO(hans): https://crbug.com/767059 -- "-Wno-tautological-unsigned-enum-zero-compare", +- # Disable -Wtautological-constant-compare (and implicitly also +- # -Wtautological-unsigned-enum-zero-compare), but re-enable +- # useful sub-diagnostics in that group. +- "-Wno-tautological-constant-compare", +- "-Wtautological-constant-out-of-range-compare", ] - } else if (use_xcode_clang && xcode_version_int >= 830) { - # This is necessary to allow a progressive transition from using xcode 8.0 -@@ -1861,7 +1844,7 @@ + } else if (use_xcode_clang) { + cflags += [ +@@ -1920,7 +1899,7 @@ # [1] crrev.com/a81d5ade0b043208e06ad71a38bcf9c348a1a52f cflags += [ "-gdwarf-3" ] } @@ -78,7 +82,7 @@ } if (use_debug_fission && !is_nacl) { cflags += [ "-gsplit-dwarf" ] -@@ -1875,7 +1858,7 @@ +@@ -1934,7 +1913,7 @@ # DWARF info may be corrupt; offsets in a range list entry are in different # sections" there. Maybe just a bug in nacl_switch_32.S. if (!is_mac && !is_ios && !is_nacl && target_cpu != "x86" && Modified: branches/2018Q1/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc ============================================================================== --- branches/2018Q1/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc Fri Mar 9 12:34:33 2018 (r463957) +++ branches/2018Q1/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc Fri Mar 9 12:54:40 2018 (r463958) @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2017-12-15 02:04:07.000000000 +0100 -+++ chrome/app/chrome_main_delegate.cc 2017-12-24 00:00:14.610706000 +0100 -@@ -96,7 +96,7 @@ +--- chrome/app/chrome_main_delegate.cc.orig 2018-02-24 16:25:09.000000000 +0100 ++++ chrome/app/chrome_main_delegate.cc 2018-03-03 20:07:40.484969000 +0100 +@@ -98,7 +98,7 @@ #include "chrome/app/shutdown_signal_handlers_posix.h" #endif @@ -9,7 +9,7 @@ #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -137,7 +137,7 @@ +@@ -133,7 +133,7 @@ #include "v8/include/v8.h" #endif @@ -18,34 +18,16 @@ #include "base/environment.h" #endif -@@ -176,7 +176,7 @@ - g_chrome_content_browser_client = LAZY_INSTANCE_INITIALIZER; - #endif +@@ -238,7 +238,7 @@ --#if defined(OS_POSIX) -+#if defined(OS_POSIX) && !defined(OS_BSD) - base::LazyInstance<ChromeCrashReporterClient>::Leaky g_chrome_crash_client = - LAZY_INSTANCE_INITIALIZER; - #endif -@@ -304,7 +304,7 @@ - // and resources loaded. - bool SubprocessNeedsResourceBundle(const std::string& process_type) { - return --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - // The zygote process opens the resources for the renderers. - process_type == switches::kZygoteProcess || - #endif -@@ -356,7 +356,7 @@ - } - #endif + #endif // defined(OS_WIN) --#if !defined(OS_MACOSX) && !defined(OS_ANDROID) -+#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - void SIGTERMProfilingShutdown(int signal) { - Profiling::Stop(); - struct sigaction sigact; -@@ -408,7 +408,7 @@ +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) && !defined(OS_BSD) + void AdjustLinuxOOMScore(const std::string& process_type) { + // Browsers and zygotes should still be killable, but killed last. + const int kZygoteScore = 0; +@@ -407,7 +407,7 @@ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -54,7 +36,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. -@@ -582,7 +582,7 @@ +@@ -581,7 +581,7 @@ #if defined(OS_CHROMEOS) chromeos::RegisterPathProvider(); #endif @@ -63,7 +45,7 @@ nacl::RegisterPathProvider(); #endif -@@ -604,7 +604,7 @@ +@@ -603,7 +603,7 @@ std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -72,7 +54,7 @@ } else if (format_str == "log") { format = diagnostics::DiagnosticsWriter::LOG; } else { -@@ -654,7 +654,7 @@ +@@ -653,7 +653,7 @@ std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -81,25 +63,16 @@ } else if (format_str == "human") { format = diagnostics::DiagnosticsWriter::HUMAN; } else { -@@ -766,7 +766,7 @@ - std::string process_type = - command_line.GetSwitchValueASCII(switches::kProcessType); - --#if defined(OS_POSIX) -+#if defined(OS_POSIX) && !defined(OS_BSD) - crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer()); +@@ -915,7 +915,7 @@ + InitializePDF(); #endif -@@ -906,7 +906,7 @@ - chrome::InitializePDF(); - #endif - -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -922,7 +922,7 @@ +@@ -931,7 +931,7 @@ breakpad::InitCrashReporter(process_type); #endif // defined(OS_ANDROID) } @@ -108,21 +81,12 @@ // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -975,7 +975,7 @@ - // This entry is not needed on Linux, where the NaCl loader - // process is launched via nacl_helper instead. - #if BUILDFLAG(ENABLE_NACL) && !defined(CHROME_MULTIPLE_DLL_BROWSER) && \ -- !defined(OS_LINUX) -+ !defined(OS_LINUX) && !defined(OS_BSD) - {switches::kNaClLoaderProcess, NaClMain}, - #else - {"<invalid>", NULL}, // To avoid constant array of size 0 -@@ -1028,7 +1028,7 @@ +@@ -941,7 +941,7 @@ + void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) { + // Note: If you are adding a new process type below, be sure to adjust the + // AdjustLinuxOOMScore function too. +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) && !defined(OS_BSD) + AdjustLinuxOOMScore(process_type); #endif - return process_type == switches::kRelauncherProcess; - } --#elif defined(OS_POSIX) && !defined(OS_ANDROID) -+#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD) - void ChromeMainDelegate::ZygoteStarting( - std::vector<std::unique_ptr<content::ZygoteForkDelegate>>* delegates) { - #if defined(OS_CHROMEOS) + #if defined(OS_WIN) Modified: branches/2018Q1/www/chromium/files/patch-chrome_app_generated__resources.grd ============================================================================== --- branches/2018Q1/www/chromium/files/patch-chrome_app_generated__resources.grd Fri Mar 9 12:34:33 2018 (r463957) +++ branches/2018Q1/www/chromium/files/patch-chrome_app_generated__resources.grd Fri Mar 9 12:54:40 2018 (r463958) @@ -1,6 +1,6 @@ ---- chrome/app/generated_resources.grd.orig 2017-12-15 02:04:07.000000000 +0100 -+++ chrome/app/generated_resources.grd 2017-12-24 00:06:55.397820000 +0100 -@@ -6903,7 +6903,7 @@ +--- chrome/app/generated_resources.grd.orig 2018-02-24 16:25:09.000000000 +0100 ++++ chrome/app/generated_resources.grd 2018-03-03 20:22:12.855371000 +0100 +@@ -6919,7 +6919,7 @@ Google Payments </message> @@ -9,7 +9,7 @@ <message name="IDS_THEMES_GROUP_NAME" desc="The title of the themes group"> Themes </message> -@@ -6911,7 +6911,7 @@ +@@ -6927,7 +6927,7 @@ <message name="IDS_THEMES_RESET_BUTTON" desc="The button to reset your theme"> Reset to default theme </message> @@ -18,12 +18,12 @@ <message name="IDS_THEMES_GTK_BUTTON" desc="The button to choose GTK colors and icons as the current theme."> Use GTK+ theme </message> -@@ -8061,7 +8061,7 @@ +@@ -8076,7 +8076,7 @@ Set as default </message> - <if expr="is_linux and not chromeos"> + <if expr="is_posix and not chromeos"> - <message name="IDS_SHOW_WINDOW_DECORATIONS_MENU" desc="The menu entry text in the tab strip context menu. This toggles the system title bar and window borders (window decorations) on linux."> - Use system title bar and borders + <message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window."> + Minimize </message> Modified: branches/2018Q1/www/chromium/files/patch-chrome_browser_browser__resources.grd ============================================================================== --- branches/2018Q1/www/chromium/files/patch-chrome_browser_browser__resources.grd Fri Mar 9 12:34:33 2018 (r463957) +++ branches/2018Q1/www/chromium/files/patch-chrome_browser_browser__resources.grd Fri Mar 9 12:54:40 2018 (r463958) @@ -1,7 +1,16 @@ ---- chrome/browser/browser_resources.grd.orig 2017-12-15 02:04:08.000000000 +0100 -+++ chrome/browser/browser_resources.grd 2017-12-24 00:39:53.904855000 +0100 -@@ -370,7 +370,7 @@ - <include name="IDR_ABOUT_VOICESEARCH_JS" file="resources\about_voicesearch.js" type="BINDATA" /> +--- chrome/browser/browser_resources.grd.orig 2018-02-24 16:25:09.000000000 +0100 ++++ chrome/browser/browser_resources.grd 2018-03-04 09:28:51.895810000 +0100 +@@ -77,7 +77,7 @@ + </if> + </structures> + <includes> +- <if expr="is_win or is_macosx or is_linux"> ++ <if expr="is_win or is_macosx or is_posix"> + <include name="IDR_ABOUT_DISCARDS_CSS" file="resources\discards\discards.css" type="BINDATA" /> + <include name="IDR_ABOUT_DISCARDS_HTML" file="resources\discards\discards.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> + <include name="IDR_ABOUT_DISCARDS_JS" file="resources\discards\discards.js" type="BINDATA" /> +@@ -369,7 +369,7 @@ + <if expr="chromeos"> <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_chromeos.json" type="BINDATA" /> </if> - <if expr="desktop_linux or (is_android and enable_plugins)"> @@ -9,8 +18,8 @@ <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_linux.json" type="BINDATA" /> </if> <if expr="is_android"> -@@ -620,7 +620,7 @@ - <include name="IDR_WELCOME_WIN10_PIN_SMALL_WEBP" file="resources\welcome\win10\pin-small.webp" type="BINDATA" /> +@@ -619,7 +619,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" /> - <if expr="is_android or is_linux"> Modified: branches/2018Q1/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc ============================================================================== --- branches/2018Q1/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc Fri Mar 9 12:34:33 2018 (r463957) +++ branches/2018Q1/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc Fri Mar 9 12:54:40 2018 (r463958) @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2017-09-05 21:05:12.000000000 +0200 -+++ chrome/browser/chrome_content_browser_client.cc 2017-09-06 17:56:29.888034000 +0200 -@@ -258,7 +258,7 @@ +--- chrome/browser/chrome_content_browser_client.cc.orig 2018-02-24 16:25:09.000000000 +0100 ++++ chrome/browser/chrome_content_browser_client.cc 2018-03-03 20:34:31.799512000 +0100 +@@ -281,7 +281,7 @@ #include "chromeos/chromeos_switches.h" #include "components/user_manager/user_manager.h" #include "services/service_manager/public/interfaces/interface_provider_spec.mojom.h" @@ -8,9 +8,9 @@ +#elif defined(OS_LINUX) || defined(OS_BSD) #include "chrome/browser/chrome_browser_main_linux.h" #elif defined(OS_ANDROID) - #include "chrome/browser/android/app_hooks.h" -@@ -286,7 +286,7 @@ - #include "chrome/browser/payments/payment_request_factory.h" + #include "base/android/application_status_listener.h" +@@ -316,7 +316,7 @@ + #include "chrome/common/importer/profile_import.mojom.h" #endif -#if defined(OS_LINUX) || defined(OS_WIN) @@ -18,7 +18,7 @@ #include "chrome/browser/webshare/share_service_impl.h" #endif -@@ -300,7 +300,7 @@ +@@ -330,7 +330,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h" #endif @@ -27,25 +27,7 @@ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" #endif -@@ -548,7 +548,7 @@ - return false; - } - --#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) - breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( - const std::string& process_type) { - base::FilePath dumps_path; -@@ -598,7 +598,7 @@ - - return -1; - } --#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) -+#endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD) - - void SetApplicationLocaleOnIOThread(const std::string& locale) { - DCHECK_CURRENTLY_ON(BrowserThread::IO); -@@ -876,7 +876,7 @@ +@@ -912,7 +912,7 @@ main_parts = new ChromeBrowserMainPartsMac(parameters); #elif defined(OS_CHROMEOS) main_parts = new chromeos::ChromeBrowserMainPartsChromeos(parameters); @@ -54,7 +36,7 @@ main_parts = new ChromeBrowserMainPartsLinux(parameters); #elif defined(OS_ANDROID) main_parts = new ChromeBrowserMainPartsAndroid(parameters); -@@ -892,7 +892,7 @@ +@@ -928,7 +928,7 @@ // Construct additional browser parts. Stages are called in the order in // which they are added. #if defined(TOOLKIT_VIEWS) @@ -63,16 +45,16 @@ main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux()); #else main_parts->AddParts(new ChromeBrowserMainExtraPartsViews()); -@@ -1540,7 +1540,7 @@ +@@ -1651,7 +1651,7 @@ command_line->AppendSwitchASCII(switches::kMetricsClientID, client_info->client_id); } -#elif defined(OS_POSIX) +#elif defined(OS_POSIX) && !defined(OS_BSD) - if (breakpad::IsCrashReporterEnabled()) { - std::string switch_value; - std::unique_ptr<metrics::ClientInfo> client_info = -@@ -2710,7 +2710,7 @@ + bool enable_crash_reporter = breakpad::IsCrashReporterEnabled(); + #if defined(OS_CHROMEOS) + // Chrome OS uses the OS-level crash_reporter for mash services, so disable +@@ -2913,7 +2913,7 @@ } } @@ -81,7 +63,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -2752,7 +2752,7 @@ +@@ -2949,7 +2949,7 @@ } #endif // defined(OS_ANDROID) } @@ -90,7 +72,7 @@ #if defined(OS_WIN) base::string16 ChromeContentBrowserClient::GetAppContainerSidForSandboxType( -@@ -3316,7 +3316,7 @@ +@@ -3630,7 +3630,7 @@ #if defined(OS_ANDROID) frame_interfaces_parameterized_->AddInterface(base::Bind( &ForwardToJavaWebContentsRegistry<blink::mojom::ShareService>)); Modified: branches/2018Q1/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc ============================================================================== --- branches/2018Q1/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc Fri Mar 9 12:34:33 2018 (r463957) +++ branches/2018Q1/www/chromium/files/patch-chrome_browser_first__run_first__run__internal__posix.cc Fri Mar 9 12:54:40 2018 (r463958) @@ -1,11 +1,20 @@ ---- chrome/browser/first_run/first_run_internal_posix.cc.orig 2017-04-19 19:06:29 UTC -+++ chrome/browser/first_run/first_run_internal_posix.cc -@@ -24,7 +24,7 @@ namespace first_run { +--- chrome/browser/first_run/first_run_internal_posix.cc.orig 2018-02-24 16:25:09.000000000 +0100 ++++ chrome/browser/first_run/first_run_internal_posix.cc 2018-03-03 21:26:08.717035000 +0100 +@@ -34,7 +34,7 @@ namespace internal { + namespace { +-#if !defined(OS_CHROMEOS) ++#if !defined(OS_CHROMEOS) && !defined(OS_BSD) + // Returns whether the first run dialog should be shown. This is only true for + // certain builds, and only if the user has not already set preferences. In a + // real, official-build first run, initializes the default metrics reporting if +@@ -80,7 +80,7 @@ + } // namespace + void DoPostImportPlatformSpecificTasks(Profile* profile) { -#if !defined(OS_CHROMEOS) +#if !defined(OS_CHROMEOS) && !defined(OS_BSD) - base::FilePath local_state_path; - PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path); - bool local_state_file_exists = base::PathExists(local_state_path); + if (!ShouldShowFirstRunDialog()) + return; + Copied: branches/2018Q1/www/chromium/files/patch-chrome_browser_ssl_ssl_error_controller_client.cc (from r463839, head/www/chromium/files/patch-chrome_browser_ssl_ssl_error_controller_client.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/chromium/files/patch-chrome_browser_ssl_ssl_error_controller_client.cc Fri Mar 9 12:54:40 2018 (r463958, copy of r463839, head/www/chromium/files/patch-chrome_browser_ssl_ssl_error_controller_client.cc) @@ -0,0 +1,20 @@ +--- chrome/browser/ssl/ssl_error_controller_client.cc.orig 2018-03-03 21:13:39.612526000 +0100 ++++ chrome/browser/ssl/ssl_error_controller_client.cc 2018-03-03 21:14:15.298290000 +0100 +@@ -55,7 +55,7 @@ + #if defined(OS_ANDROID) + chrome::android::OpenDateAndTimeSettings(); + +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + struct ClockCommand { + const char* const pathname; + const char* const argument; +@@ -185,7 +185,7 @@ + + bool SSLErrorControllerClient::CanLaunchDateAndTimeSettings() { + #if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX) || \ +- defined(OS_WIN) ++ defined(OS_WIN) || defined(OS_BSD) + return true; + #else + return false; Modified: branches/2018Q1/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc ============================================================================== --- branches/2018Q1/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc Fri Mar 9 12:34:33 2018 (r463957) +++ branches/2018Q1/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc Fri Mar 9 12:54:40 2018 (r463958) @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_group.cc.orig 2017-12-15 02:04:10.000000000 +0100 -+++ chrome/browser/task_manager/sampling/task_group.cc 2017-12-24 02:18:09.634446000 +0100 -@@ -28,9 +28,9 @@ +--- chrome/browser/task_manager/sampling/task_group.cc.orig 2018-02-24 16:25:10.000000000 +0100 ++++ chrome/browser/task_manager/sampling/task_group.cc 2018-03-03 21:46:29.318291000 +0100 +@@ -29,9 +29,9 @@ #if defined(OS_WIN) REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME | #endif // defined(OS_WIN) @@ -12,19 +12,19 @@ #if BUILDFLAG(ENABLE_NACL) REFRESH_TYPE_NACL | #endif // BUILDFLAG(ENABLE_NACL) -@@ -103,9 +103,9 @@ +@@ -105,9 +105,9 @@ + #if BUILDFLAG(ENABLE_NACL) nacl_debug_stub_port_(nacl::kGdbDebugStubPortUnknown), #endif // BUILDFLAG(ENABLE_NACL) - idle_wakeups_per_second_(-1), -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) open_fd_count_(-1), -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) + idle_wakeups_per_second_(-1), gpu_memory_has_duplicates_(false), is_backgrounded_(false), - weak_ptr_factory_(this) { -@@ -118,10 +118,10 @@ +@@ -121,10 +121,10 @@ weak_ptr_factory_.GetWeakPtr()), base::Bind(&TaskGroup::OnIdleWakeupsRefreshDone, weak_ptr_factory_.GetWeakPtr()), @@ -37,9 +37,9 @@ base::Bind(&TaskGroup::OnProcessPriorityDone, weak_ptr_factory_.GetWeakPtr())); -@@ -338,14 +338,14 @@ - OnBackgroundRefreshTypeFinished(REFRESH_TYPE_IDLE_WAKEUPS); +@@ -284,14 +284,14 @@ } + #endif // BUILDFLAG(ENABLE_NACL) -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) @@ -52,5 +52,5 @@ -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) - void TaskGroup::OnProcessPriorityDone(bool is_backgrounded) { + void TaskGroup::OnCpuRefreshDone(double cpu_usage) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); Modified: branches/2018Q1/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h ============================================================================== --- branches/2018Q1/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h Fri Mar 9 12:34:33 2018 (r463957) +++ branches/2018Q1/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.h Fri Mar 9 12:54:40 2018 (r463958) @@ -1,8 +1,8 @@ ---- chrome/browser/task_manager/sampling/task_group.h.orig 2017-04-19 19:06:30 UTC -+++ chrome/browser/task_manager/sampling/task_group.h -@@ -96,9 +96,9 @@ class TaskGroup { +--- chrome/browser/task_manager/sampling/task_group.h.orig 2018-02-24 16:25:10.000000000 +0100 ++++ chrome/browser/task_manager/sampling/task_group.h 2018-03-03 21:51:35.928601000 +0100 +@@ -106,9 +106,9 @@ int nacl_debug_stub_port() const { return nacl_debug_stub_port_; } - #endif // !defined(DISABLE_NACL) + #endif // BUILDFLAG(ENABLE_NACL) -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) @@ -12,28 +12,28 @@ int idle_wakeups_per_second() const { return idle_wakeups_per_second_; } -@@ -124,9 +124,9 @@ class TaskGroup { - - void OnIdleWakeupsRefreshDone(int idle_wakeups_per_second); - +@@ -122,9 +122,9 @@ + void RefreshNaClDebugStubPort(int child_process_unique_id); + void OnRefreshNaClDebugStubPortDone(int port); + #endif -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) void OnOpenFdCountRefreshDone(int open_fd_count); -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) - void OnProcessPriorityDone(bool is_backgrounded); - -@@ -174,10 +174,10 @@ class TaskGroup { + void OnCpuRefreshDone(double cpu_usage); + void OnMemoryUsageRefreshDone(MemoryUsageStats memory_usage); +@@ -184,10 +184,10 @@ + #if BUILDFLAG(ENABLE_NACL) int nacl_debug_stub_port_; - #endif // !defined(DISABLE_NACL) - int idle_wakeups_per_second_; + #endif // BUILDFLAG(ENABLE_NACL) -#if defined(OS_LINUX) +#if defined(OS_LINUX) || defined(OS_BSD) // The number of file descriptors currently open by the process. int open_fd_count_; -#endif // defined(OS_LINUX) +#endif // defined(OS_LINUX) || defined(OS_BSD) + int idle_wakeups_per_second_; bool gpu_memory_has_duplicates_; bool is_backgrounded_; - Modified: branches/2018Q1/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc ============================================================================== --- branches/2018Q1/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc Fri Mar 9 12:34:33 2018 (r463957) +++ branches/2018Q1/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc Fri Mar 9 12:54:40 2018 (r463958) @@ -1,7 +1,7 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2017-06-05 19:03:03 UTC -+++ chrome/browser/ui/browser_command_controller.cc -@@ -80,7 +80,7 @@ - #include "chrome/browser/ui/browser_commands_chromeos.h" +--- chrome/browser/ui/browser_command_controller.cc.orig 2018-02-24 16:25:10.000000000 +0100 ++++ chrome/browser/ui/browser_command_controller.cc 2018-03-03 21:58:39.480640000 +0100 +@@ -83,7 +83,7 @@ + #include "ui/base/clipboard/clipboard_types.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) @@ -9,7 +9,7 @@ #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -209,7 +209,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -216,7 +216,7 @@ #endif } @@ -18,21 +18,21 @@ // If this key was registered by the user as a content editing hotkey, then // it is not reserved. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = -@@ -413,7 +413,7 @@ void BrowserCommandController::ExecuteCommandWithDispo +@@ -425,7 +425,7 @@ break; #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - case IDC_USE_SYSTEM_TITLE_BAR: { - PrefService* prefs = profile()->GetPrefs(); - prefs->SetBoolean(prefs::kUseCustomChromeFrame, -@@ -766,7 +766,7 @@ void BrowserCommandController::InitCommandState() { + case IDC_MINIMIZE_WINDOW: + browser_->window()->Minimize(); + break; +@@ -853,7 +853,7 @@ command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_2, true); command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_3, true); #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) - command_updater_.UpdateCommandEnabled(IDC_USE_SYSTEM_TITLE_BAR, true); - #endif - + command_updater_.UpdateCommandEnabled(IDC_MINIMIZE_WINDOW, true); + command_updater_.UpdateCommandEnabled(IDC_MAXIMIZE_WINDOW, true); + command_updater_.UpdateCommandEnabled(IDC_RESTORE_WINDOW, true); Copied: branches/2018Q1/www/chromium/files/patch-chrome_browser_ui_sad_tab.cc (from r463839, head/www/chromium/files/patch-chrome_browser_ui_sad_tab.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/chromium/files/patch-chrome_browser_ui_sad_tab.cc Fri Mar 9 12:54:40 2018 (r463958, copy of r463839, head/www/chromium/files/patch-chrome_browser_ui_sad_tab.cc) @@ -0,0 +1,11 @@ +--- chrome/browser/ui/sad_tab.cc.orig 2018-03-03 21:11:09.039038000 +0100 ++++ chrome/browser/ui/sad_tab.cc 2018-03-03 21:11:28.213027000 +0100 +@@ -180,7 +180,7 @@ + // Only show incognito suggestion if not already in Incognito mode. + if (!web_contents_->GetBrowserContext()->IsOffTheRecord()) + message_ids.insert(message_ids.begin(), IDS_SAD_TAB_RELOAD_INCOGNITO); +-#if defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + // Note: on macOS, Linux and ChromeOS, the first bullet is either one of + // IDS_SAD_TAB_RELOAD_CLOSE_TABS or IDS_SAD_TAB_RELOAD_CLOSE_NOTABS + // followed by one of the above suggestions. Copied: branches/2018Q1/www/chromium/files/patch-chrome_browser_ui_views_frame_browser_non_client_frame_view_factory_views.cc (from r463839, head/www/chromium/files/patch-chrome_browser_ui_views_frame_browser_non_client_frame_view_factory_views.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/chromium/files/patch-chrome_browser_ui_views_frame_browser_non_client_frame_view_factory_views.cc Fri Mar 9 12:54:40 2018 (r463958, copy of r463839, head/www/chromium/files/patch-chrome_browser_ui_views_frame_browser_non_client_frame_view_factory_views.cc) @@ -0,0 +1,11 @@ +--- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2018-03-03 21:07:27.595112000 +0100 ++++ chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc 2018-03-03 21:07:57.689186000 +0100 +@@ -18,7 +18,7 @@ + #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" + #endif + *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803091254.w29CsewA065013>