Date: Thu, 20 Nov 2014 12:45:34 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r372912 - in branches/2014Q4/www/chromium: . files Message-ID: <201411201245.sAKCjYCi069513@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Thu Nov 20 12:45:33 2014 New Revision: 372912 URL: https://svnweb.freebsd.org/changeset/ports/372912 QAT: https://qat.redports.org/buildarchive/r372912/ Log: MFH: r372849 www/chromium: update to 39.0.2171.65 Security: d395e44f-6f4f-11e4-a444-00262d5ed8ee Approved by: portmgr (erwin) Added: branches/2014Q4/www/chromium/files/patch-chrome__browser__metrics__chrome_browser_main_extra_parts_metrics.cc - copied unchanged from r372849, head/www/chromium/files/patch-chrome__browser__metrics__chrome_browser_main_extra_parts_metrics.cc branches/2014Q4/www/chromium/files/patch-chrome__chrome_tests_unit.gypi - copied unchanged from r372849, head/www/chromium/files/patch-chrome__chrome_tests_unit.gypi branches/2014Q4/www/chromium/files/patch-device__hid__hid_service.cc - copied unchanged from r372849, head/www/chromium/files/patch-device__hid__hid_service.cc branches/2014Q4/www/chromium/files/patch-device__media_transfer_protocol__media_transfer_protocol_manager.h - copied unchanged from r372849, head/www/chromium/files/patch-device__media_transfer_protocol__media_transfer_protocol_manager.h branches/2014Q4/www/chromium/files/patch-device__usb__usb.gyp - copied unchanged from r372849, head/www/chromium/files/patch-device__usb__usb.gyp branches/2014Q4/www/chromium/files/patch-device__usb__usb_context.cc - copied unchanged from r372849, head/www/chromium/files/patch-device__usb__usb_context.cc branches/2014Q4/www/chromium/files/patch-device__usb__usb_context_unittest.cc - copied unchanged from r372849, head/www/chromium/files/patch-device__usb__usb_context_unittest.cc branches/2014Q4/www/chromium/files/patch-device__usb__usb_device_handle_impl.cc - copied unchanged from r372849, head/www/chromium/files/patch-device__usb__usb_device_handle_impl.cc branches/2014Q4/www/chromium/files/patch-device__usb__usb_device_handle_impl.h - copied unchanged from r372849, head/www/chromium/files/patch-device__usb__usb_device_handle_impl.h branches/2014Q4/www/chromium/files/patch-device__usb__usb_device_impl.cc - copied unchanged from r372849, head/www/chromium/files/patch-device__usb__usb_device_impl.cc branches/2014Q4/www/chromium/files/patch-device__usb__usb_error.cc - copied unchanged from r372849, head/www/chromium/files/patch-device__usb__usb_error.cc branches/2014Q4/www/chromium/files/patch-device__usb__usb_service_impl.cc - copied unchanged from r372849, head/www/chromium/files/patch-device__usb__usb_service_impl.cc Deleted: branches/2014Q4/www/chromium/files/patch-chrome__app__generated_resources.grd branches/2014Q4/www/chromium/files/patch-chrome__browser__net__ssl_config_service_manager_pref.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__prefs__command_line_pref_store.cc branches/2014Q4/www/chromium/files/patch-chrome__common__localized_error.cc branches/2014Q4/www/chromium/files/patch-components__usb_service.gypi branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_context.cc branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_context_unittest.cc branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_device_handle_impl.cc branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_device_impl.cc branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_error.cc branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_interface_impl.cc branches/2014Q4/www/chromium/files/patch-components__usb_service__usb_service_impl.cc branches/2014Q4/www/chromium/files/patch-net__base__net_error_list.h branches/2014Q4/www/chromium/files/patch-net__socket__ssl_client_socket_nss.cc branches/2014Q4/www/chromium/files/patch-net__socket__ssl_client_socket_openssl.cc branches/2014Q4/www/chromium/files/patch-net__ssl__ssl_config.cc branches/2014Q4/www/chromium/files/patch-net__ssl__ssl_config.h branches/2014Q4/www/chromium/files/patch-tools__metrics__histograms__histograms.xml branches/2014Q4/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc Modified: branches/2014Q4/www/chromium/Makefile branches/2014Q4/www/chromium/distinfo branches/2014Q4/www/chromium/files/extra-patch-clang branches/2014Q4/www/chromium/files/extra-patch-gcc branches/2014Q4/www/chromium/files/patch-base__base.gyp branches/2014Q4/www/chromium/files/patch-base__base.gypi branches/2014Q4/www/chromium/files/patch-base__debug__stack_trace_posix.cc branches/2014Q4/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h branches/2014Q4/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc branches/2014Q4/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc branches/2014Q4/www/chromium/files/patch-base__process__internal_linux.h branches/2014Q4/www/chromium/files/patch-base__process__launch.cc branches/2014Q4/www/chromium/files/patch-base__process__launch.h branches/2014Q4/www/chromium/files/patch-base__process__memory_unittest.cc branches/2014Q4/www/chromium/files/patch-base__process__process_iterator_freebsd.cc branches/2014Q4/www/chromium/files/patch-base__process__process_metrics.h branches/2014Q4/www/chromium/files/patch-base__process__process_metrics_freebsd.cc branches/2014Q4/www/chromium/files/patch-base__security_unittest.cc branches/2014Q4/www/chromium/files/patch-base__strings__safe_sprintf.cc branches/2014Q4/www/chromium/files/patch-base__sys_info_freebsd.cc branches/2014Q4/www/chromium/files/patch-base__sys_info_posix.cc branches/2014Q4/www/chromium/files/patch-base__test__expectations__expectation.cc branches/2014Q4/www/chromium/files/patch-base__test__launcher__test_launcher.cc branches/2014Q4/www/chromium/files/patch-base__threading__platform_thread_linux.cc branches/2014Q4/www/chromium/files/patch-breakpad__breakpad.gyp branches/2014Q4/www/chromium/files/patch-build__common.gypi branches/2014Q4/www/chromium/files/patch-build__filename_rules.gypi branches/2014Q4/www/chromium/files/patch-build__linux__system.gyp branches/2014Q4/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp branches/2014Q4/www/chromium/files/patch-build__linux__unbundle__openssl.gyp branches/2014Q4/www/chromium/files/patch-cc__layers__layer_impl.cc branches/2014Q4/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc branches/2014Q4/www/chromium/files/patch-chrome__app__chrome_main_delegate.h branches/2014Q4/www/chromium/files/patch-chrome__app__chromium_strings.grd branches/2014Q4/www/chromium/files/patch-chrome__app__resources__locale_settings.grd branches/2014Q4/www/chromium/files/patch-chrome__browser__about_flags.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h branches/2014Q4/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h branches/2014Q4/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__memory_details.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__net__connection_tester.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__notifications__message_center_notification_manager.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__safe_browsing__incident_reporting__incident_handler_util.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__browser_view_prefs.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_layout.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__tabs__tab_strip.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h branches/2014Q4/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc branches/2014Q4/www/chromium/files/patch-chrome__browser__web_applications__web_app.h branches/2014Q4/www/chromium/files/patch-chrome__chrome_browser.gypi branches/2014Q4/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi branches/2014Q4/www/chromium/files/patch-chrome__chrome_browser_ui.gypi branches/2014Q4/www/chromium/files/patch-chrome__common__chrome_paths.cc branches/2014Q4/www/chromium/files/patch-chrome__common__chrome_paths.h branches/2014Q4/www/chromium/files/patch-chrome__common__chrome_switches.cc branches/2014Q4/www/chromium/files/patch-chrome__common__chrome_switches.h branches/2014Q4/www/chromium/files/patch-chrome__common__pref_names.cc branches/2014Q4/www/chromium/files/patch-chrome__common__pref_names.h branches/2014Q4/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc branches/2014Q4/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.h branches/2014Q4/www/chromium/files/patch-chrome__renderer__printing__print_web_view_helper.h branches/2014Q4/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc branches/2014Q4/www/chromium/files/patch-chrome__test__base__testing_browser_process.h branches/2014Q4/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc branches/2014Q4/www/chromium/files/patch-chrome__test__perf__perf_test.cc branches/2014Q4/www/chromium/files/patch-chrome__tools__build__linux__sed.sh branches/2014Q4/www/chromium/files/patch-components__omaha_query_params__omaha_query_params.cc branches/2014Q4/www/chromium/files/patch-components__policy__resources__policy_templates.json branches/2014Q4/www/chromium/files/patch-components__policy__tools__generate_policy_source.py branches/2014Q4/www/chromium/files/patch-components__storage_monitor.gypi branches/2014Q4/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc branches/2014Q4/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc branches/2014Q4/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h branches/2014Q4/www/chromium/files/patch-content__app__content_main_runner.cc branches/2014Q4/www/chromium/files/patch-content__browser__browser_main_loop.cc branches/2014Q4/www/chromium/files/patch-content__browser__child_process_launcher.cc branches/2014Q4/www/chromium/files/patch-content__browser__download__base_file.cc branches/2014Q4/www/chromium/files/patch-content__browser__download__base_file_linux.cc branches/2014Q4/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc branches/2014Q4/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc branches/2014Q4/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h branches/2014Q4/www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc branches/2014Q4/www/chromium/files/patch-content__browser__indexed_db__indexed_db_backing_store.cc branches/2014Q4/www/chromium/files/patch-content__browser__tracing__tracing_ui.cc branches/2014Q4/www/chromium/files/patch-content__common__set_process_title_linux.cc branches/2014Q4/www/chromium/files/patch-content__common__set_process_title_linux.h branches/2014Q4/www/chromium/files/patch-content__content_browser.gypi branches/2014Q4/www/chromium/files/patch-content__content_common.gypi branches/2014Q4/www/chromium/files/patch-content__content_tests.gypi branches/2014Q4/www/chromium/files/patch-content__gpu__gpu_child_thread.cc branches/2014Q4/www/chromium/files/patch-content__gpu__gpu_main.cc branches/2014Q4/www/chromium/files/patch-content__public__common__content_switches.cc branches/2014Q4/www/chromium/files/patch-content__public__common__content_switches.h branches/2014Q4/www/chromium/files/patch-content__public__test__browser_test_base.cc branches/2014Q4/www/chromium/files/patch-content__renderer__accessibility__blink_ax_tree_source.cc branches/2014Q4/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc branches/2014Q4/www/chromium/files/patch-content__renderer__pepper__usb_key_code_conversion.cc branches/2014Q4/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc branches/2014Q4/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc branches/2014Q4/www/chromium/files/patch-crypto__nss_util.cc branches/2014Q4/www/chromium/files/patch-device__hid__hid.gyp branches/2014Q4/www/chromium/files/patch-device__serial__serial.gyp branches/2014Q4/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc branches/2014Q4/www/chromium/files/patch-extensions__browser__api__serial__serial_api.cc branches/2014Q4/www/chromium/files/patch-gpu__config__gpu_control_list.cc branches/2014Q4/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc branches/2014Q4/www/chromium/files/patch-gpu__config__gpu_info_collector.cc branches/2014Q4/www/chromium/files/patch-gpu__config__gpu_test_config.cc branches/2014Q4/www/chromium/files/patch-gpu__config__gpu_util.cc branches/2014Q4/www/chromium/files/patch-gpu__gpu_config.gypi branches/2014Q4/www/chromium/files/patch-media__audio__audio_input_volume_unittest.cc branches/2014Q4/www/chromium/files/patch-media__base__audio_splicer.cc branches/2014Q4/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc branches/2014Q4/www/chromium/files/patch-media__media.gyp branches/2014Q4/www/chromium/files/patch-media__video__capture__video_capture_device_factory.cc branches/2014Q4/www/chromium/files/patch-native_client__build__common.gypi branches/2014Q4/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp branches/2014Q4/www/chromium/files/patch-net__base__address_tracker_linux.h branches/2014Q4/www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc branches/2014Q4/www/chromium/files/patch-net__base__dns_reloader.cc branches/2014Q4/www/chromium/files/patch-net__base__mime_util_unittest.cc branches/2014Q4/www/chromium/files/patch-net__base__net_util.h branches/2014Q4/www/chromium/files/patch-net__base__network_change_notifier.cc branches/2014Q4/www/chromium/files/patch-net__dns__address_sorter_posix.cc branches/2014Q4/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc branches/2014Q4/www/chromium/files/patch-net__dns__dns_session.cc branches/2014Q4/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc branches/2014Q4/www/chromium/files/patch-net__http__http_auth_gssapi_posix.h branches/2014Q4/www/chromium/files/patch-net__http__mock_gssapi_library_posix.h branches/2014Q4/www/chromium/files/patch-net__net.gyp branches/2014Q4/www/chromium/files/patch-net__net.gypi branches/2014Q4/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc branches/2014Q4/www/chromium/files/patch-net__proxy__proxy_service.cc branches/2014Q4/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc branches/2014Q4/www/chromium/files/patch-net__socket__socks5_client_socket.cc branches/2014Q4/www/chromium/files/patch-net__socket__tcp_listen_socket_unittest.h branches/2014Q4/www/chromium/files/patch-net__udp__udp_socket_unittest.cc branches/2014Q4/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc branches/2014Q4/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc branches/2014Q4/www/chromium/files/patch-printing__printing.gyp branches/2014Q4/www/chromium/files/patch-remoting__remoting_host.gypi branches/2014Q4/www/chromium/files/patch-skia__skia_chrome.gypi branches/2014Q4/www/chromium/files/patch-skia__skia_common.gypi branches/2014Q4/www/chromium/files/patch-sync__util__get_session_name.cc branches/2014Q4/www/chromium/files/patch-sync__util__get_session_name_linux.cc branches/2014Q4/www/chromium/files/patch-testing__gtest__include__gtest__internal__gtest-port.h branches/2014Q4/www/chromium/files/patch-testing__gtest__src__gtest.cc branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__ThreadState.cpp branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h branches/2014Q4/www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp branches/2014Q4/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c branches/2014Q4/www/chromium/files/patch-third_party__khronos__khronos.gyp branches/2014Q4/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp branches/2014Q4/www/chromium/files/patch-third_party__libexif__libexif.gyp branches/2014Q4/www/chromium/files/patch-third_party__libjingle__libjingle.gyp branches/2014Q4/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp branches/2014Q4/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp branches/2014Q4/www/chromium/files/patch-third_party__libvpx__unpack_lib_posix.sh branches/2014Q4/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h branches/2014Q4/www/chromium/files/patch-third_party__pdfium__build__standalone.gypi branches/2014Q4/www/chromium/files/patch-third_party__pdfium__core__include__fxcrt__fx_system.h branches/2014Q4/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp branches/2014Q4/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__jsapi__fxjs_v8.cpp branches/2014Q4/www/chromium/files/patch-third_party__pdfium__pdfium.gyp branches/2014Q4/www/chromium/files/patch-third_party__pdfium__third_party__logging.h branches/2014Q4/www/chromium/files/patch-third_party__sfntly__sfntly.gyp branches/2014Q4/www/chromium/files/patch-third_party__sqlite__sqlite.gyp branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__cpumonitor.cc branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__httpcommon.cc branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__ipaddress.h branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__linux.cc branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__linux.h branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__network.cc branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__network.h branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__physicalsocketserver.cc branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__stringutils.h branches/2014Q4/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc branches/2014Q4/www/chromium/files/patch-third_party__webrtc__build__common.gypi branches/2014Q4/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi branches/2014Q4/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi branches/2014Q4/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc branches/2014Q4/www/chromium/files/patch-third_party__webrtc__modules__video_coding__main__source__receiver.cc branches/2014Q4/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc branches/2014Q4/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__cpu_info.cc branches/2014Q4/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__thread_posix.cc branches/2014Q4/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h branches/2014Q4/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py branches/2014Q4/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp branches/2014Q4/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp branches/2014Q4/www/chromium/files/patch-ui__app_list__app_list_constants.cc branches/2014Q4/www/chromium/files/patch-ui__app_list__app_list_constants.h branches/2014Q4/www/chromium/files/patch-ui__base__ui_base.gyp branches/2014Q4/www/chromium/files/patch-ui__events__event_switches.cc branches/2014Q4/www/chromium/files/patch-ui__events__event_switches.h branches/2014Q4/www/chromium/files/patch-ui__gl__gl.gyp branches/2014Q4/www/chromium/files/patch-ui__resources__ui_resources.grd branches/2014Q4/www/chromium/files/patch-ui__shell_dialogs__select_file_dialog.cc branches/2014Q4/www/chromium/files/patch-ui__views__views.gyp branches/2014Q4/www/chromium/files/patch-ui__views__views_delegate.cc branches/2014Q4/www/chromium/files/patch-ui__views__views_delegate.h branches/2014Q4/www/chromium/files/patch-ui__views__window__custom_frame_view.cc branches/2014Q4/www/chromium/files/patch-v8__src__base__platform__platform-freebsd.cc branches/2014Q4/www/chromium/files/patch-v8__src__preparser.h branches/2014Q4/www/chromium/pkg-plist Directory Properties: branches/2014Q4/ (props changed) Modified: branches/2014Q4/www/chromium/Makefile ============================================================================== --- branches/2014Q4/www/chromium/Makefile Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/Makefile Thu Nov 20 12:45:33 2014 (r372912) @@ -1,8 +1,9 @@ # Created by: Florent Thoumie <flz@FreeBSD.org> # $FreeBSD$ +#TODO bz@ : if you do undestand the gyp stuff, third_party/widevine/cdm/widevine_cdm.gyp talks about it (plz install libwidevinecdm.so) PORTNAME= chromium -PORTVERSION= 38.0.2125.122 +PORTVERSION= 39.0.2171.65 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -13,7 +14,7 @@ COMMENT= Google web browser based on Web LICENSE= BSD3CLAUSE LGPL21 MPL LICENSE_COMB= multi -CFLAGS+= -fno-stack-protector -isystem${LOCALBASE}/include +CFLAGS+= -isystem${LOCALBASE}/include BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf \ bash:${PORTSDIR}/shells/bash \ @@ -264,6 +265,7 @@ pre-configure: 'third_party/dom_distiller_js' \ 'third_party/dom_distiller_js/package/proto_gen/third_party/dom_distiller_js' \ 'third_party/ffmpeg' \ + 'third_party/gardiner_mod' \ 'third_party/fips181' \ 'third_party/flot' \ 'third_party/hunspell' \ Modified: branches/2014Q4/www/chromium/distinfo ============================================================================== --- branches/2014Q4/www/chromium/distinfo Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/distinfo Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ -SHA256 (chromium-38.0.2125.122.tar.xz) = 3ea94fb3151f59c2d5088f832f8e894897489922a63bfa04f0068ee2fc0e36f3 -SIZE (chromium-38.0.2125.122.tar.xz) = 248207688 -SHA256 (chromium-38.0.2125.122-testdata.tar.xz) = 75f55ee898c3d3dbd2cb8701bb94d2ce6dee13e050df38610c66e99830f1bae6 -SIZE (chromium-38.0.2125.122-testdata.tar.xz) = 115344076 +SHA256 (chromium-39.0.2171.65.tar.xz) = b15746316f2abef40792395d9a0da28ef17713289b9bd334a8ad3ee8b764f451 +SIZE (chromium-39.0.2171.65.tar.xz) = 253057636 +SHA256 (chromium-39.0.2171.65-testdata.tar.xz) = 4be2e8909268a9901ab714b57eabd53329580f83b7525c7dace7a36fbb3e7ea5 +SIZE (chromium-39.0.2171.65-testdata.tar.xz) = 115238768 Modified: branches/2014Q4/www/chromium/files/extra-patch-clang ============================================================================== --- branches/2014Q4/www/chromium/files/extra-patch-clang Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/extra-patch-clang Thu Nov 20 12:45:33 2014 (r372912) @@ -217,17 +217,6 @@ #if defined(__GCC__) #pragma GCC diagnostic pop #endif ---- v8/src/unique.h.orig 2014-01-07 21:03:55.000000000 +0100 -+++ v8/src/unique.h 2014-01-13 00:41:59.000000000 +0100 -@@ -130,7 +130,7 @@ - - // TODO(titzer): this is a hack to migrate to Unique<T> incrementally. - static Unique<T> CreateUninitialized(Handle<T> handle) { -- return Unique<T>(reinterpret_cast<Address>(NULL), handle); -+ return Unique<T>(static_cast<Address>(NULL), handle); - } - - static Unique<T> CreateImmovable(Handle<T> handle) { --- content/browser/frame_host/render_widget_host_view_guest.cc.orig 2014-03-05 22:24:07.000000000 +0100 +++ content/browser/frame_host/render_widget_host_view_guest.cc 2014-03-09 20:01:20.000000000 +0100 @@ -258,11 +258,11 @@ @@ -256,14 +245,14 @@ tasks_.erase(it, tasks_.end()); ---- v8/src/unique.h.orig 2014-09-04 02:30:24.000000000 +0200 -+++ v8/src/unique.h 2014-09-10 16:19:37.000000000 +0200 -@@ -167,7 +167,7 @@ +--- v8/src/unique.h.orig 2014-10-10 11:16:50.000000000 +0200 ++++ v8/src/unique.h 2014-10-13 18:55:35.000000000 +0200 +@@ -110,7 +110,7 @@ // TODO(titzer): this is a hack to migrate to Unique<T> incrementally. - static PrintableUnique<T> CreateUninitialized(Zone* zone, Handle<T> handle) { -- return PrintableUnique<T>(zone, reinterpret_cast<Address>(NULL), handle); -+ return PrintableUnique<T>(zone, static_cast<Address>(NULL), handle); + static Unique<T> CreateUninitialized(Handle<T> handle) { +- return Unique<T>(reinterpret_cast<Address>(NULL), handle); ++ return Unique<T>(static_cast<Address>(NULL), handle); } - static PrintableUnique<T> CreateImmovable(Zone* zone, Handle<T> handle) { + static Unique<T> CreateImmovable(Handle<T> handle) { Modified: branches/2014Q4/www/chromium/files/extra-patch-gcc ============================================================================== --- branches/2014Q4/www/chromium/files/extra-patch-gcc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/extra-patch-gcc Thu Nov 20 12:45:33 2014 (r372912) @@ -66,13 +66,13 @@ #include <jpeglib.h> #elif defined(USE_LIBJPEG_TURBO) #include "third_party/libjpeg_turbo/jpeglib.h" ---- media/cast/logging/encoding_event_subscriber.cc.orig 2014-10-02 19:39:47.000000000 +0200 -+++ media/cast/logging/encoding_event_subscriber.cc 2014-10-06 10:38:30.000000000 +0200 -@@ -4,6 +4,7 @@ +--- third_party/webrtc/common_audio/wav_writer.h.orig 2014-10-17 02:57:34.000000000 +0200 ++++ third_party/webrtc/common_audio/wav_writer.h 2014-10-18 12:04:03.000000000 +0200 +@@ -14,6 +14,7 @@ + #ifdef __cplusplus - #include "media/cast/logging/encoding_event_subscriber.h" - -+#include <algorithm> - #include <cstring> - #include <utility> + #include <stdint.h> ++#include <stdio.h> + #include <cstddef> + #include <string> Modified: branches/2014Q4/www/chromium/files/patch-base__base.gyp ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__base.gyp Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__base.gyp Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/base.gyp.orig 2014-10-02 21:05:31 UTC +--- base/base.gyp.orig 2014-10-10 09:15:29 UTC +++ base/base.gyp @@ -129,7 +129,7 @@ ], @@ -9,7 +9,7 @@ ], }, }], -@@ -784,6 +784,11 @@ +@@ -803,6 +803,11 @@ ['include', '^debug/proc_maps_linux_unittest\\.cc$'], ], }], Modified: branches/2014Q4/www/chromium/files/patch-base__base.gypi ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__base.gypi Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__base.gypi Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/base.gypi.orig 2014-10-02 17:39:45 UTC +--- base/base.gypi.orig 2014-10-10 09:15:29 UTC +++ base/base.gypi @@ -945,11 +945,16 @@ 'process/memory_stubs.cc', Modified: branches/2014Q4/www/chromium/files/patch-base__debug__stack_trace_posix.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__debug__stack_trace_posix.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__debug__stack_trace_posix.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/debug/stack_trace_posix.cc.orig 2014-10-02 17:18:52 UTC +--- base/debug/stack_trace_posix.cc.orig 2014-10-10 09:15:29 UTC +++ base/debug/stack_trace_posix.cc @@ -588,6 +588,10 @@ // for the modules that are loaded in the current process. Modified: branches/2014Q4/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/files/file_path_watcher_kqueue.h.orig 2014-10-02 17:18:52 UTC +--- base/files/file_path_watcher_kqueue.h.orig 2014-10-10 09:15:29 UTC +++ base/files/file_path_watcher_kqueue.h @@ -5,6 +5,10 @@ #ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_ Modified: branches/2014Q4/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/posix/unix_domain_socket_linux.cc.orig 2014-10-02 17:18:52 UTC +--- base/posix/unix_domain_socket_linux.cc.orig 2014-10-10 08:54:09 UTC +++ base/posix/unix_domain_socket_linux.cc @@ -18,6 +18,15 @@ #include "base/posix/eintr_wrapper.h" Modified: branches/2014Q4/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/posix/unix_domain_socket_linux_unittest.cc.orig 2014-10-02 17:18:52 UTC +--- base/posix/unix_domain_socket_linux_unittest.cc.orig 2014-10-10 08:54:09 UTC +++ base/posix/unix_domain_socket_linux_unittest.cc @@ -2,8 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be Modified: branches/2014Q4/www/chromium/files/patch-base__process__internal_linux.h ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__process__internal_linux.h Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__process__internal_linux.h Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/process/internal_linux.h.orig 2014-10-02 17:18:52 UTC +--- base/process/internal_linux.h.orig 2014-10-10 08:54:09 UTC +++ base/process/internal_linux.h @@ -12,6 +12,8 @@ Modified: branches/2014Q4/www/chromium/files/patch-base__process__launch.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__process__launch.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__process__launch.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/process/launch.cc.orig 2014-10-02 17:18:52 UTC +--- base/process/launch.cc.orig 2014-10-10 08:54:09 UTC +++ base/process/launch.cc @@ -24,10 +24,10 @@ fds_to_remap(NULL), Modified: branches/2014Q4/www/chromium/files/patch-base__process__launch.h ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__process__launch.h Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__process__launch.h Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/process/launch.h.orig 2014-10-02 17:18:52 UTC +--- base/process/launch.h.orig 2014-10-10 08:54:09 UTC +++ base/process/launch.h @@ -113,14 +113,14 @@ // will be the same as its pid. Modified: branches/2014Q4/www/chromium/files/patch-base__process__memory_unittest.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__process__memory_unittest.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__process__memory_unittest.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/process/memory_unittest.cc.orig 2014-10-02 17:18:52 UTC +--- base/process/memory_unittest.cc.orig 2014-10-10 09:15:29 UTC +++ base/process/memory_unittest.cc @@ -160,9 +160,9 @@ Modified: branches/2014Q4/www/chromium/files/patch-base__process__process_iterator_freebsd.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__process__process_iterator_freebsd.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__process__process_iterator_freebsd.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/process/process_iterator_freebsd.cc.orig 2014-10-02 17:18:52 UTC +--- base/process/process_iterator_freebsd.cc.orig 2014-10-10 08:54:09 UTC +++ base/process/process_iterator_freebsd.cc @@ -8,6 +8,10 @@ #include <sys/sysctl.h> Modified: branches/2014Q4/www/chromium/files/patch-base__process__process_metrics.h ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__process__process_metrics.h Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__process__process_metrics.h Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/process/process_metrics.h.orig 2014-10-02 17:39:45 UTC +--- base/process/process_metrics.h.orig 2014-10-10 08:54:09 UTC +++ base/process/process_metrics.h @@ -17,6 +17,13 @@ #include "base/time/time.h" @@ -14,7 +14,7 @@ #if defined(OS_MACOSX) #include <mach/mach.h> #endif -@@ -240,13 +247,17 @@ +@@ -246,13 +253,17 @@ // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. BASE_EXPORT int ParseProcStatCPU(const std::string& input); Modified: branches/2014Q4/www/chromium/files/patch-base__process__process_metrics_freebsd.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__process__process_metrics_freebsd.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__process__process_metrics_freebsd.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/process/process_metrics_freebsd.cc.orig 2014-10-02 17:18:52 UTC +--- base/process/process_metrics_freebsd.cc.orig 2014-10-10 08:54:09 UTC +++ base/process/process_metrics_freebsd.cc @@ -10,6 +10,9 @@ Modified: branches/2014Q4/www/chromium/files/patch-base__security_unittest.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__security_unittest.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__security_unittest.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/security_unittest.cc.orig 2014-10-02 17:18:52 UTC +--- base/security_unittest.cc.orig 2014-10-10 09:15:29 UTC +++ base/security_unittest.cc @@ -160,7 +160,7 @@ // FAILS_ is too clunky. Modified: branches/2014Q4/www/chromium/files/patch-base__strings__safe_sprintf.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__strings__safe_sprintf.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__strings__safe_sprintf.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/strings/safe_sprintf.cc.orig 2014-10-02 17:18:52 UTC +--- base/strings/safe_sprintf.cc.orig 2014-10-10 08:54:09 UTC +++ base/strings/safe_sprintf.cc @@ -107,15 +107,16 @@ : buffer_(buffer), Modified: branches/2014Q4/www/chromium/files/patch-base__sys_info_freebsd.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__sys_info_freebsd.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__sys_info_freebsd.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/sys_info_freebsd.cc.orig 2014-10-02 17:18:52 UTC +--- base/sys_info_freebsd.cc.orig 2014-10-10 08:54:09 UTC +++ base/sys_info_freebsd.cc @@ -4,6 +4,7 @@ Modified: branches/2014Q4/www/chromium/files/patch-base__sys_info_posix.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__sys_info_posix.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__sys_info_posix.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,6 +1,6 @@ ---- base/sys_info_posix.cc.orig 2014-10-02 17:39:45 UTC +--- base/sys_info_posix.cc.orig 2014-10-10 08:54:09 UTC +++ base/sys_info_posix.cc -@@ -64,7 +64,7 @@ +@@ -75,7 +75,7 @@ namespace base { Modified: branches/2014Q4/www/chromium/files/patch-base__test__expectations__expectation.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__test__expectations__expectation.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__test__expectations__expectation.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/test/expectations/expectation.cc.orig 2014-10-02 17:18:52 UTC +--- base/test/expectations/expectation.cc.orig 2014-10-10 08:54:09 UTC +++ base/test/expectations/expectation.cc @@ -60,6 +60,7 @@ variant != "64") { Modified: branches/2014Q4/www/chromium/files/patch-base__test__launcher__test_launcher.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__test__launcher__test_launcher.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__test__launcher__test_launcher.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/test/launcher/test_launcher.cc.orig 2014-10-02 17:39:45 UTC +--- base/test/launcher/test_launcher.cc.orig 2014-10-10 09:15:29 UTC +++ base/test/launcher/test_launcher.cc @@ -45,6 +45,10 @@ #include "base/win/windows_version.h" @@ -10,4 +10,4 @@ + namespace base { - // Launches a child process using |command_line|. If the child process is still + // See https://groups.google.com/a/chromium.org/d/msg/chromium-dev/nkdTP7sstSc/uT3FaE_sgkAJ . Modified: branches/2014Q4/www/chromium/files/patch-base__threading__platform_thread_linux.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-base__threading__platform_thread_linux.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-base__threading__platform_thread_linux.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_linux.cc.orig 2014-10-02 17:39:45 UTC +--- base/threading/platform_thread_linux.cc.orig 2014-10-10 08:54:09 UTC +++ base/threading/platform_thread_linux.cc @@ -16,7 +16,9 @@ #include "base/tracked_objects.h" Modified: branches/2014Q4/www/chromium/files/patch-breakpad__breakpad.gyp ============================================================================== --- branches/2014Q4/www/chromium/files/patch-breakpad__breakpad.gyp Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-breakpad__breakpad.gyp Thu Nov 20 12:45:33 2014 (r372912) @@ -1,6 +1,6 @@ ---- breakpad/breakpad.gyp.orig 2014-10-02 17:39:45 UTC +--- breakpad/breakpad.gyp.orig 2014-10-10 09:15:29 UTC +++ breakpad/breakpad.gyp -@@ -349,7 +349,7 @@ +@@ -353,7 +353,7 @@ }, ], }], Modified: branches/2014Q4/www/chromium/files/patch-build__common.gypi ============================================================================== --- branches/2014Q4/www/chromium/files/patch-build__common.gypi Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-build__common.gypi Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- build/common.gypi.orig 2014-10-02 17:39:45 UTC +--- build/common.gypi.orig 2014-10-10 09:15:29 UTC +++ build/common.gypi @@ -91,7 +91,7 @@ @@ -9,7 +9,7 @@ 'use_ash%': 1, 'use_aura%': 1, }], -@@ -676,7 +676,7 @@ +@@ -702,7 +702,7 @@ }], # DBus usage. @@ -18,7 +18,7 @@ 'use_dbus%': 1, }, { 'use_dbus%': 0, -@@ -931,7 +931,7 @@ +@@ -952,7 +952,7 @@ }, { 'use_openmax_dl_fft%': 0, }], @@ -27,7 +27,7 @@ 'enable_mdns%' : 1, }], -@@ -954,7 +954,7 @@ +@@ -975,7 +975,7 @@ # except when building Android WebView or Chromecast. # TODO(jshin): Handle 'use_system_icu' on Linux (Chromium). # Set the data reduction proxy origin for Android Webview. @@ -36,7 +36,7 @@ 'icu_use_data_file_flag%' : 1, 'spdy_proxy_auth_origin%': '', 'data_reduction_proxy_probe_url%': '', -@@ -1193,6 +1193,10 @@ +@@ -1228,6 +1228,10 @@ # able to turn it off for various reasons. 'linux_disable_pie%': 0, @@ -47,7 +47,7 @@ # The release channel that this build targets. This is used to restrict # channel-specific build options, like which installer packages to create. # The default is 'all', which does no channel-specific filtering. -@@ -4280,6 +4284,13 @@ +@@ -4391,6 +4395,13 @@ 'ldflags': [ '-Wl,--no-keep-memory', ], Modified: branches/2014Q4/www/chromium/files/patch-build__filename_rules.gypi ============================================================================== --- branches/2014Q4/www/chromium/files/patch-build__filename_rules.gypi Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-build__filename_rules.gypi Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- build/filename_rules.gypi.orig 2014-10-02 17:18:52 UTC +--- build/filename_rules.gypi.orig 2014-10-10 08:54:09 UTC +++ build/filename_rules.gypi @@ -85,7 +85,7 @@ ['<(use_aura)==0 or OS!="win" or >(nacl_untrusted_build)==1', { Modified: branches/2014Q4/www/chromium/files/patch-build__linux__system.gyp ============================================================================== --- branches/2014Q4/www/chromium/files/patch-build__linux__system.gyp Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-build__linux__system.gyp Thu Nov 20 12:45:33 2014 (r372912) @@ -1,6 +1,6 @@ ---- build/linux/system.gyp.orig 2014-10-02 17:39:45 UTC +--- build/linux/system.gyp.orig 2014-10-10 08:54:09 UTC +++ build/linux/system.gyp -@@ -890,6 +890,13 @@ +@@ -866,6 +866,13 @@ 'include_dirs': [ '../..', ], Modified: branches/2014Q4/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp ============================================================================== --- branches/2014Q4/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- build/linux/unbundle/libwebp.gyp.orig 2014-10-02 17:18:52 UTC +--- build/linux/unbundle/libwebp.gyp.orig 2014-10-10 08:54:09 UTC +++ build/linux/unbundle/libwebp.gyp @@ -14,13 +14,7 @@ }, Modified: branches/2014Q4/www/chromium/files/patch-build__linux__unbundle__openssl.gyp ============================================================================== --- branches/2014Q4/www/chromium/files/patch-build__linux__unbundle__openssl.gyp Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-build__linux__unbundle__openssl.gyp Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- build/linux/unbundle/openssl.gyp.orig 2014-10-02 17:18:52 UTC +--- build/linux/unbundle/openssl.gyp.orig 2014-10-10 08:54:09 UTC +++ build/linux/unbundle/openssl.gyp @@ -9,15 +9,15 @@ 'type': 'none', Modified: branches/2014Q4/www/chromium/files/patch-cc__layers__layer_impl.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-cc__layers__layer_impl.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-cc__layers__layer_impl.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,6 +1,6 @@ ---- cc/layers/layer_impl.cc.orig 2014-10-02 17:39:45 UTC +--- cc/layers/layer_impl.cc.orig 2014-10-10 09:15:29 UTC +++ cc/layers/layer_impl.cc -@@ -1201,21 +1201,23 @@ +@@ -1202,21 +1202,23 @@ scale_factor * scaled_scroll_bounds.height()); scaled_scroll_bounds = gfx::ToFlooredSize(scaled_scroll_bounds); Modified: branches/2014Q4/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,33 +1,15 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2014-10-02 17:39:45 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2014-10-10 09:15:29 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -94,7 +94,7 @@ +@@ -97,7 +97,7 @@ #include "ui/base/x/x11_util.h" #endif -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - #include "components/breakpad/app/breakpad_linux.h" + #include "components/crash/app/breakpad_linux.h" #endif -@@ -124,7 +124,7 @@ - g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER; - #endif - --#if defined(OS_POSIX) -+#if defined(OS_POSIX) && !defined(OS_BSD) - base::LazyInstance<chrome::ChromeBreakpadClient>::Leaky - g_chrome_breakpad_client = LAZY_INSTANCE_INITIALIZER; - #endif -@@ -225,7 +225,7 @@ - // Mac needs them for the plugin process name. - process_type == switches::kPluginProcess || - #endif --#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 -@@ -441,7 +441,7 @@ +@@ -449,7 +449,7 @@ std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -36,7 +18,7 @@ } else if (format_str == "log") { format = diagnostics::DiagnosticsWriter::LOG; } else { -@@ -492,7 +492,7 @@ +@@ -500,7 +500,7 @@ std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -45,16 +27,16 @@ } else if (format_str == "human") { format = diagnostics::DiagnosticsWriter::HUMAN; } else { -@@ -632,7 +632,7 @@ +@@ -640,7 +640,7 @@ std::string process_type = command_line.GetSwitchValueASCII(switches::kProcessType); -#if defined(OS_POSIX) +#if defined(OS_POSIX) && !defined(OS_BSD) - breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer()); + crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer()); #endif -@@ -759,7 +759,7 @@ +@@ -767,7 +767,7 @@ #endif } @@ -63,7 +45,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -771,7 +771,7 @@ +@@ -779,7 +779,7 @@ breakpad::InitCrashReporter(process_type); #endif // defined(OS_ANDROID) } @@ -72,7 +54,7 @@ // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -863,7 +863,7 @@ +@@ -875,7 +875,7 @@ #endif return process_type == switches::kRelauncherProcess; } Modified: branches/2014Q4/www/chromium/files/patch-chrome__app__chrome_main_delegate.h ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__app__chrome_main_delegate.h Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__app__chrome_main_delegate.h Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/app/chrome_main_delegate.h.orig 2014-10-02 17:18:53 UTC +--- chrome/app/chrome_main_delegate.h.orig 2014-10-10 09:15:29 UTC +++ chrome/app/chrome_main_delegate.h @@ -38,7 +38,7 @@ virtual bool ShouldSendMachPort(const std::string& process_type) OVERRIDE; Modified: branches/2014Q4/www/chromium/files/patch-chrome__app__chromium_strings.grd ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__app__chromium_strings.grd Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__app__chromium_strings.grd Thu Nov 20 12:45:33 2014 (r372912) @@ -1,6 +1,6 @@ ---- chrome/app/chromium_strings.grd.orig 2014-10-02 17:39:45 UTC +--- chrome/app/chromium_strings.grd.orig 2014-10-10 09:15:29 UTC +++ chrome/app/chromium_strings.grd -@@ -1115,7 +1115,7 @@ +@@ -1136,7 +1136,7 @@ </message> <!-- ProcessSingleton --> Modified: branches/2014Q4/www/chromium/files/patch-chrome__app__resources__locale_settings.grd ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__app__resources__locale_settings.grd Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__app__resources__locale_settings.grd Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/app/resources/locale_settings.grd.orig 2014-10-02 17:39:45 UTC +--- chrome/app/resources/locale_settings.grd.orig 2014-10-10 09:15:30 UTC +++ chrome/app/resources/locale_settings.grd @@ -264,7 +264,7 @@ 55 Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__about_flags.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__about_flags.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__about_flags.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,6 +1,6 @@ ---- chrome/browser/about_flags.cc.orig 2014-10-02 17:39:45 UTC +--- chrome/browser/about_flags.cc.orig 2014-10-10 09:15:30 UTC +++ chrome/browser/about_flags.cc -@@ -2278,7 +2278,7 @@ +@@ -2260,7 +2260,7 @@ return kOsWin; #elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check. return kOsCrOS; Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2014-10-02 17:39:45 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2014-10-10 09:15:30 UTC +++ chrome/browser/chrome_browser_main.cc @@ -947,7 +947,7 @@ } Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/browser/chrome_browser_main_posix.cc.orig 2014-10-02 17:18:53 UTC +--- chrome/browser/chrome_browser_main_posix.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/chrome_browser_main_posix.cc @@ -270,6 +270,11 @@ g_pipe_pid = getpid(); Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2014-10-02 17:39:45 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2014-10-10 09:15:30 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -430,7 +430,7 @@ +@@ -434,7 +434,7 @@ return false; } @@ -9,7 +9,7 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( const std::string& process_type) { base::FilePath dumps_path; -@@ -487,7 +487,7 @@ +@@ -491,7 +491,7 @@ return -1; } @@ -18,7 +18,7 @@ #if !defined(OS_CHROMEOS) GURL GetEffectiveURLForSignin(const GURL& url) { -@@ -1196,7 +1196,7 @@ +@@ -1194,7 +1194,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( CommandLine* command_line, int child_process_id) { @@ -27,7 +27,7 @@ if (breakpad::IsCrashReporterEnabled()) { scoped_ptr<metrics::ClientInfo> client_info = GoogleUpdateSettings::LoadMetricsClientInfo(); -@@ -1204,7 +1204,7 @@ +@@ -1202,7 +1202,7 @@ client_info ? client_info->client_id : std::string()); } @@ -36,7 +36,7 @@ if (logging::DialogsAreSuppressed()) command_line->AppendSwitch(switches::kNoErrorDialogs); -@@ -2447,7 +2447,7 @@ +@@ -2408,7 +2408,7 @@ } } @@ -45,7 +45,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const CommandLine& command_line, int child_process_id, -@@ -2513,7 +2513,7 @@ +@@ -2474,7 +2474,7 @@ } #endif // defined(OS_ANDROID) } Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h Thu Nov 20 12:45:33 2014 (r372912) @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2014-10-02 17:39:45 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2014-10-10 09:15:30 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -287,7 +287,7 @@ +@@ -278,7 +278,7 @@ virtual net::CookieStore* OverrideCookieStoreForRenderProcess( int render_process_id) OVERRIDE; Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/browser/diagnostics/diagnostics_writer.cc.orig 2014-10-02 17:18:53 UTC +--- chrome/browser/diagnostics/diagnostics_writer.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/diagnostics/diagnostics_writer.cc @@ -266,7 +266,7 @@ console_->SetColor(color); Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/browser/diagnostics/diagnostics_writer.h.orig 2014-10-02 17:18:53 UTC +--- chrome/browser/diagnostics/diagnostics_writer.h.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/diagnostics/diagnostics_writer.h @@ -18,7 +18,7 @@ public: Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2014-10-02 17:18:53 UTC +--- chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc @@ -167,10 +167,12 @@ } Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2014-10-02 17:39:45 UTC +--- chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/extensions/api/music_manager_private/device_id_linux.cc @@ -4,6 +4,10 @@ Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/browser/gpu/gl_string_manager.cc.orig 2014-10-02 17:18:53 UTC +--- chrome/browser/gpu/gl_string_manager.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/gpu/gl_string_manager.cc @@ -25,7 +25,7 @@ Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/browser/gpu/gpu_feature_checker.cc.orig 2014-10-02 17:39:45 UTC +--- chrome/browser/gpu/gpu_feature_checker.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/gpu/gpu_feature_checker.cc @@ -33,7 +33,7 @@ CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/browser/media/webrtc_log_uploader.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/media/webrtc_log_uploader.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/media/webrtc_log_uploader.cc @@ -233,6 +233,8 @@ const char product[] = "Chrome_Android"; Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc @@ -33,9 +33,11 @@ // Note that this initializes the delegate asynchronously, but since Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,6 +1,6 @@ ---- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/media_galleries/media_file_system_registry.cc.orig 2014-10-10 09:15:30 UTC +++ chrome/browser/media_galleries/media_file_system_registry.cc -@@ -734,7 +734,10 @@ +@@ -738,7 +738,10 @@ // Constructor in 'private' section because depends on private class definition. MediaFileSystemRegistry::MediaFileSystemRegistry() : file_system_context_(new MediaFileSystemContextImpl) { Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/browser/media_galleries/media_folder_finder.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/media_galleries/media_folder_finder.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/media_galleries/media_folder_finder.cc @@ -50,10 +50,10 @@ chrome::DIR_USER_APPLICATIONS, Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__memory_details.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__memory_details.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__memory_details.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,7 +1,7 @@ ---- chrome/browser/memory_details.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/memory_details.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/memory_details.cc -@@ -27,7 +27,7 @@ - #include "grit/generated_resources.h" +@@ -26,7 +26,7 @@ + #include "content/public/common/bindings_policy.h" #include "ui/base/l10n/l10n_util.h" -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) @@ -9,7 +9,7 @@ #include "content/public/browser/zygote_host_linux.h" #endif -@@ -248,7 +248,7 @@ +@@ -247,7 +247,7 @@ void MemoryDetails::CollectChildInfoOnUIThread() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); @@ -18,7 +18,7 @@ const pid_t zygote_pid = content::ZygoteHost::GetInstance()->GetPid(); #endif -@@ -390,7 +390,7 @@ +@@ -389,7 +389,7 @@ } } Copied: branches/2014Q4/www/chromium/files/patch-chrome__browser__metrics__chrome_browser_main_extra_parts_metrics.cc (from r372849, head/www/chromium/files/patch-chrome__browser__metrics__chrome_browser_main_extra_parts_metrics.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__metrics__chrome_browser_main_extra_parts_metrics.cc Thu Nov 20 12:45:33 2014 (r372912, copy of r372849, head/www/chromium/files/patch-chrome__browser__metrics__chrome_browser_main_extra_parts_metrics.cc) @@ -0,0 +1,18 @@ +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2014-10-10 09:15:30 UTC ++++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc +@@ -27,12 +27,14 @@ + + #if defined(OS_LINUX) && !defined(OS_CHROMEOS) + #include <gnu/libc-version.h> ++#endif + ++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) + #include "base/version.h" + #if defined(USE_X11) + #include "ui/base/x/x11_util.h" + #endif +-#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#endif + + #if defined(OS_WIN) + #include "chrome/installer/util/google_update_settings.h" Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__net__connection_tester.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__net__connection_tester.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__net__connection_tester.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/browser/net/connection_tester.cc.orig 2014-10-02 17:18:53 UTC +--- chrome/browser/net/connection_tester.cc.orig 2014-10-10 09:15:30 UTC +++ chrome/browser/net/connection_tester.cc @@ -219,7 +219,7 @@ // Otherwise returns a network error code. Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__notifications__message_center_notification_manager.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__notifications__message_center_notification_manager.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__notifications__message_center_notification_manager.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,6 +1,6 @@ ---- chrome/browser/notifications/message_center_notification_manager.cc.orig 2014-09-10 01:47:12.000000000 +0200 -+++ chrome/browser/notifications/message_center_notification_manager.cc 2014-09-18 14:21:16.000000000 +0200 -@@ -84,7 +84,7 @@ +--- chrome/browser/notifications/message_center_notification_manager.cc.orig 2014-10-10 09:15:30 UTC ++++ chrome/browser/notifications/message_center_notification_manager.cc +@@ -82,7 +82,7 @@ blockers_.push_back(new FullscreenNotificationBlocker(message_center)); #if defined(OS_WIN) || defined(OS_MACOSX) \ Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/browser/plugins/plugins_resource_service.cc.orig 2014-10-02 17:18:54 UTC +--- chrome/browser/plugins/plugins_resource_service.cc.orig 2014-10-10 08:54:10 UTC +++ chrome/browser/plugins/plugins_resource_service.cc @@ -33,7 +33,7 @@ std::string filename; Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/policy/policy_prefs_browsertest.cc.orig 2014-10-10 09:15:30 UTC +++ chrome/browser/policy/policy_prefs_browsertest.cc @@ -169,6 +169,8 @@ const std::string os("chromeos"); Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__safe_browsing__incident_reporting__incident_handler_util.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__safe_browsing__incident_reporting__incident_handler_util.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__safe_browsing__incident_reporting__incident_handler_util.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,4 +1,4 @@ ---- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2014-10-02 17:18:54 UTC +--- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig 2014-10-10 08:54:11 UTC +++ chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc @@ -8,7 +8,12 @@ Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,6 +1,6 @@ ---- chrome/browser/ssl/ssl_blocking_page.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/ssl/ssl_blocking_page.cc.orig 2014-10-10 09:15:30 UTC +++ chrome/browser/ssl/ssl_blocking_page.cc -@@ -260,7 +260,7 @@ +@@ -234,7 +234,7 @@ // settings. Weird. TODO(palmer): Do something more graceful than ignoring // the user's click! crbug.com/394993 return; @@ -9,7 +9,7 @@ struct ClockCommand { const char* pathname; const char* argument; -@@ -310,7 +310,7 @@ +@@ -284,7 +284,7 @@ #if !defined(OS_CHROMEOS) base::LaunchOptions options; options.wait = false; Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__browser_view_prefs.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__browser_view_prefs.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__browser_view_prefs.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,5 +1,5 @@ ---- chrome/browser/ui/browser_view_prefs.cc.orig 2014-10-06 09:19:40.000000000 +0200 -+++ chrome/browser/ui/browser_view_prefs.cc 2014-10-06 09:24:45.000000000 +0200 +--- chrome/browser/ui/browser_view_prefs.cc.orig 2014-10-10 08:54:11 UTC ++++ chrome/browser/ui/browser_view_prefs.cc @@ -9,7 +9,7 @@ #include "chrome/common/pref_names.h" #include "components/pref_registry/pref_registry_syncable.h" Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2014-10-10 09:15:30 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc -@@ -79,7 +79,7 @@ +@@ -80,7 +80,7 @@ #include "components/user_manager/user_manager.h" #endif Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,20 +1,20 @@ ---- chrome/browser/ui/views/apps/chrome_native_app_window_views.cc.orig 2014-10-06 09:32:59.000000000 +0200 -+++ chrome/browser/ui/views/apps/chrome_native_app_window_views.cc 2014-10-06 09:40:11.000000000 +0200 +--- chrome/browser/ui/views/apps/chrome_native_app_window_views.cc.orig 2014-10-10 09:15:30 UTC ++++ chrome/browser/ui/views/apps/chrome_native_app_window_views.cc @@ -29,7 +29,7 @@ #include "ui/wm/core/easy_resize_window_targeter.h" #include "ui/wm/core/shadow_types.h" -#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_BSD) ++#if defined(OS_LINUX) || defined(OS_BSD) #include "chrome/browser/shell_integration_linux.h" #endif -@@ -217,7 +217,7 @@ - init_params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; - init_params.keep_on_top = create_params.always_on_top; +@@ -219,7 +219,7 @@ + init_params.visible_on_all_workspaces = + create_params.visible_on_all_workspaces; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) // Set up a custom WM_CLASS for app windows. This allows task switchers in // X11 environments to distinguish them from main browser windows. init_params.wm_class_name = web_app::GetWMClassFromAppName(app_name); Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/chrome_views_delegate.cc.orig 2014-10-06 09:19:23.000000000 +0200 -+++ chrome/browser/ui/views/chrome_views_delegate.cc 2014-10-06 09:22:54.000000000 +0200 -@@ -44,7 +44,7 @@ +--- chrome/browser/ui/views/chrome_views_delegate.cc.orig 2014-10-10 08:54:11 UTC ++++ chrome/browser/ui/views/chrome_views_delegate.cc +@@ -45,7 +45,7 @@ #include "ui/views/widget/native_widget_aura.h" #endif @@ -9,16 +9,16 @@ #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -234,7 +234,7 @@ +@@ -235,7 +235,7 @@ return chrome::IsNativeViewInAsh(window); } -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) ++#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) gfx::ImageSkia* ChromeViewsDelegate::GetDefaultWindowIcon() const { ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); return rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_64); -@@ -373,7 +373,7 @@ +@@ -374,7 +374,7 @@ #endif } Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h Thu Nov 20 12:45:33 2014 (r372912) @@ -1,11 +1,11 @@ ---- chrome/browser/ui/views/chrome_views_delegate.h.orig 2014-10-06 09:19:31.000000000 +0200 -+++ chrome/browser/ui/views/chrome_views_delegate.h 2014-10-06 09:23:19.000000000 +0200 +--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2014-10-10 09:15:30 UTC ++++ chrome/browser/ui/views/chrome_views_delegate.h @@ -36,7 +36,7 @@ #if defined(OS_WIN) virtual HICON GetDefaultWindowIcon() const OVERRIDE; virtual bool IsWindowInMetro(gfx::NativeWindow window) const OVERRIDE; -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) ++#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) virtual gfx::ImageSkia* GetDefaultWindowIcon() const OVERRIDE; #endif @@ -14,7 +14,7 @@ views::Widget::InitParams* params, views::internal::NativeWidgetDelegate* delegate) OVERRIDE; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) virtual bool WindowManagerProvidesTitleBar(bool maximized) OVERRIDE; #endif #if defined(USE_AURA) Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/first_run_dialog.cc.orig 2014-10-02 17:39:46 UTC +--- chrome/browser/ui/views/first_run_dialog.cc.orig 2014-10-10 08:54:11 UTC +++ chrome/browser/ui/views/first_run_dialog.cc -@@ -124,12 +124,16 @@ +@@ -118,12 +118,16 @@ bool FirstRunDialog::Accept() { GetWidget()->Hide(); Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,5 +1,5 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2014-10-06 09:37:47.000000000 +0200 -+++ chrome/browser/ui/views/frame/browser_frame.cc 2014-10-06 09:37:33.000000000 +0200 +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2014-10-10 08:54:11 UTC ++++ chrome/browser/ui/views/frame/browser_frame.cc @@ -36,7 +36,7 @@ #include "ui/views/controls/menu/menu_runner.h" #include "ui/views/widget/native_widget.h" Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2014-10-06 09:39:10.000000000 +0200 -+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc 2014-10-06 09:39:57.000000000 +0200 -@@ -53,7 +53,7 @@ +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2014-10-10 09:15:30 UTC ++++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc +@@ -52,7 +52,7 @@ #include "ui/views/window/frame_background.h" #include "ui/views/window/window_shape.h" @@ -9,7 +9,7 @@ #include "ui/views/controls/menu/menu_runner.h" #endif -@@ -78,7 +78,7 @@ +@@ -77,7 +77,7 @@ // The icon never shrinks below 16 px on a side. const int kIconMinimumSize = 16; @@ -18,7 +18,7 @@ // The number of pixels to move the frame background image upwards when using // the GTK+ theme and the titlebar is condensed. const int kGTKThemeCondensedFrameTopInset = 15; -@@ -316,7 +316,7 @@ +@@ -318,7 +318,7 @@ void OpaqueBrowserFrameView::OnMenuButtonClicked(views::View* source, const gfx::Point& point) { @@ -27,7 +27,7 @@ views::MenuRunner menu_runner(frame()->GetSystemMenuModel(), views::MenuRunner::HAS_MNEMONICS); ignore_result(menu_runner.RunMenuAt(browser_view()->GetWidget(), -@@ -569,7 +569,7 @@ +@@ -571,7 +571,7 @@ } bool OpaqueBrowserFrameView::ShouldShowWindowTitleBar() const { @@ -36,7 +36,7 @@ // Do not show the custom title bar if the system title bar option is enabled. if (!frame()->UseCustomFrame()) return false; -@@ -614,7 +614,7 @@ +@@ -616,7 +616,7 @@ frame_background_->set_theme_image(GetFrameImage()); frame_background_->set_theme_overlay_image(GetFrameOverlayImage()); frame_background_->set_top_area_height(GetTopAreaHeight()); Modified: branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_layout.cc ============================================================================== --- branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_layout.cc Thu Nov 20 12:35:37 2014 (r372911) +++ branches/2014Q4/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_layout.cc Thu Nov 20 12:45:33 2014 (r372912) @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc.orig 2014-10-06 09:41:06.000000000 +0200 -+++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc 2014-10-06 09:40:51.000000000 +0200 -@@ -81,7 +81,7 @@ +--- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc.orig 2014-10-10 09:15:30 UTC ++++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc +@@ -82,7 +82,7 @@ // is no avatar icon. const int kTabStripIndent = -6; *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411201245.sAKCjYCi069513>