Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 12 Aug 2016 18:51:46 +0000 (UTC)
From:      Rene Ladan <rene@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r420138 - in head/www/chromium: . files
Message-ID:  <201608121851.u7CIpkxh069977@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rene
Date: Fri Aug 12 18:51:46 2016
New Revision: 420138
URL: https://svnweb.freebsd.org/changeset/ports/420138

Log:
  www/chromium: update to 52.0.2743.116
  
  Mark BROKEN on FreeBSD 9 for now, does not patch
  
  Submitted by:	"LeFroid" via GitHub
  MFH:		2016Q3
  Security:	https://vuxml.freebsd.org/freebsd/6fae9fe1-5048-11e6-8aa7-3065ec8fd3ec.html

Added:
  head/www/chromium/files/patch-chrome_browser_platform__util.h   (contents, props changed)
  head/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py   (contents, props changed)
  head/www/chromium/files/patch-chrome_chrome__resources.gyp   (contents, props changed)
  head/www/chromium/files/patch-content_renderer_media_webrtc__audio__renderer.cc   (contents, props changed)
  head/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc   (contents, props changed)
  head/www/chromium/files/patch-services_shell_public_cpp_lib_initialize__base__and__icu.cc   (contents, props changed)
  head/www/chromium/files/patch-services_shell_runner_init.cc   (contents, props changed)
  head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp   (contents, props changed)
  head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h   (contents, props changed)
  head/www/chromium/files/patch-third__party_pdfium_build__gyp_standalone.gypi   (contents, props changed)
  head/www/chromium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h   (contents, props changed)
  head/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.h   (contents, props changed)
  head/www/chromium/files/patch-ui_message__center_views_message__view__factory.cc   (contents, props changed)
  head/www/chromium/files/patch-ui_views_bubble_bubble__dialog__delegate.cc   (contents, props changed)
  head/www/chromium/files/patch-ui_webui_resources_js_icon.js   (contents, props changed)
  head/www/chromium/files/patch-v8_src_profiler_sampler.cc   (contents, props changed)
Deleted:
  head/www/chromium/files/patch-base_i18n_icu__util.cc
  head/www/chromium/files/patch-base_i18n_icu__util.h
  head/www/chromium/files/patch-content_renderer_media_webrtc__audio__capturer.cc
  head/www/chromium/files/patch-mojo_shell_public_cpp_initialize__base__and__icu.cc
  head/www/chromium/files/patch-mojo_shell_runner_init.cc
  head/www/chromium/files/patch-third__party_WebKit_Source_platform_text_Character.cpp
  head/www/chromium/files/patch-third__party_flac_flac.gyp
  head/www/chromium/files/patch-third__party_libwebp_libwebp.gyp
  head/www/chromium/files/patch-third__party_pdfium_build_standalone.gypi
  head/www/chromium/files/patch-ui_message__center_views_message__center__view.cc
  head/www/chromium/files/patch-ui_message__center_views_notification__view.cc
  head/www/chromium/files/patch-ui_views_bubble_bubble__delegate.cc
  head/www/chromium/files/patch-ui_views_controls_button_label__button.cc
  head/www/chromium/files/patch-ui_views_controls_scrollbar_base__scroll__bar.cc
  head/www/chromium/files/patch-ui_webui_resources_js_util.js
Modified:
  head/www/chromium/Makefile
  head/www/chromium/distinfo
  head/www/chromium/files/extra-patch-clang
  head/www/chromium/files/patch-base_base.gyp
  head/www/chromium/files/patch-build_common.gypi
  head/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc
  head/www/chromium/files/patch-components_dom__distiller_core_page__features.cc
  head/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h
  head/www/chromium/files/patch-content_browser_geolocation_wifi__data__provider__freebsd.cc
  head/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc
  head/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
  head/www/chromium/files/patch-content_gpu_gpu__main.cc
  head/www/chromium/files/patch-content_renderer_render__thread__impl.cc
  head/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc
  head/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc
  head/www/chromium/files/patch-media_audio_audio__manager.cc
  head/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc
  head/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc
  head/www/chromium/files/patch-net_base_address__tracker__linux.h
  head/www/chromium/files/patch-net_proxy_proxy__service.cc
  head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp
  head/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp
  head/www/chromium/files/patch-ui_base_ime_input__method__factory.cc
  head/www/chromium/files/patch-ui_base_resource_resource__bundle.cc
  head/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc
  head/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
  head/www/chromium/files/patch-ui_views_style_platform__style.cc
  head/www/chromium/pkg-plist

Modified: head/www/chromium/Makefile
==============================================================================
--- head/www/chromium/Makefile	Fri Aug 12 16:58:34 2016	(r420137)
+++ head/www/chromium/Makefile	Fri Aug 12 18:51:46 2016	(r420138)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	chromium
-PORTVERSION=	51.0.2704.106
-PORTREVISION=	2
+PORTVERSION=	52.0.2743.116
 CATEGORIES=	www
 MASTER_SITES=	http://commondatastorage.googleapis.com/chromium-browser-official/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on
@@ -14,6 +13,8 @@ COMMENT=	Google web browser based on Web
 LICENSE=	BSD3CLAUSE LGPL21 MPL
 LICENSE_COMB=	multi
 
+BROKEN_FreeBSD_9=does not patch
+
 CFLAGS+=	-isystem${LOCALBASE}/include -I${PREFIX}/include/atk-1.0
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:devel/gperf \
@@ -101,7 +102,7 @@ GYP_DEFINES+=	\
 		enable_webrtc=1 \
 		werror= \
 		no_gc_sections=1 \
-                OS=freebsd \
+		OS=freebsd \
 		os_ver=${OSVERSION} \
 		prefix_dir=${LOCALBASE} \
 		python_ver=${PYTHON_VER} \
@@ -255,8 +256,8 @@ pre-everything::
 post-patch:
 	@${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|" \
 		${WRKSRC}/crypto/crypto.gyp \
-		${WRKSRC}/v8/tools/gyp/v8.gyp \
-		${WRKSRC}/v8/build/toolchain.gypi
+		${WRKSRC}/v8/src/v8.gyp \
+		${WRKSRC}/v8/gypfiles/toolchain.gypi
 	@${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" \
 		${WRKSRC}/chrome/common/chrome_paths.cc \
 		${WRKSRC}/base/base.gyp
@@ -279,7 +280,6 @@ pre-configure:
 		'chrome/third_party/mock4js' \
 		'chrome/third_party/mozilla_security_manager' \
 		'courgette/third_party' \
-		'crypto/third_party/nss' \
 		'net/third_party/mozilla_security_manager' \
 		'net/third_party/nss' \
 		'third_party/WebKit' \
@@ -291,7 +291,7 @@ pre-configure:
 		'third_party/boringssl' \
 		'third_party/cacheinvalidation' \
 		'third_party/catapult' \
-		'third_party/catapult/third_party/beautifulsoup' \
+		'third_party/catapult/third_party/beautifulsoup4' \
 		'third_party/catapult/third_party/py_vulcanize' \
 		'third_party/catapult/third_party/py_vulcanize/py_vulcanize' \
 		'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \
@@ -341,6 +341,8 @@ pre-configure:
 		'third_party/ply' \
 		'third_party/polymer' \
 		'third_party/protobuf' \
+		'third_party/protobuf/third_party' \
+		'third_party/protobuf/third_party/six' \
 		'third_party/pywebsocket' \
 		'third_party/qcms' \
 		'third_party/qunit' \

Modified: head/www/chromium/distinfo
==============================================================================
--- head/www/chromium/distinfo	Fri Aug 12 16:58:34 2016	(r420137)
+++ head/www/chromium/distinfo	Fri Aug 12 18:51:46 2016	(r420138)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1466791065
-SHA256 (chromium-51.0.2704.106.tar.xz) = fb97a6a3119ec2c8cc4ad9a0bd6c4d306516769039a2633633f7d0c770012cfd
-SIZE (chromium-51.0.2704.106.tar.xz) = 448656636
-SHA256 (chromium-51.0.2704.106-testdata.tar.xz) = 926b44fd0020922ce50b4b838391ae0c531ba4ee3fc6915c4c8b7fd95db765e5
-SIZE (chromium-51.0.2704.106-testdata.tar.xz) = 121454396
+TIMESTAMP = 1470404034
+SHA256 (chromium-52.0.2743.116.tar.xz) = a194ae1edb041024b3d4b6ba438f32fefdb6f1ecb24a96c50248a486b237a101
+SIZE (chromium-52.0.2743.116.tar.xz) = 458156660
+SHA256 (chromium-52.0.2743.116-testdata.tar.xz) = d3d059e1215702d8665f02b47a10e14458f54f423c323a9fcc987e6e43767c0b
+SIZE (chromium-52.0.2743.116-testdata.tar.xz) = 122423496

Modified: head/www/chromium/files/extra-patch-clang
==============================================================================
--- head/www/chromium/files/extra-patch-clang	Fri Aug 12 16:58:34 2016	(r420137)
+++ head/www/chromium/files/extra-patch-clang	Fri Aug 12 18:51:46 2016	(r420138)
@@ -62,22 +62,6 @@
              GetSession(session_tag)->windows[window_id]);
    GetSession(session_tag)->windows[window_id] = window_ptr;
  }
---- content/browser/frame_host/render_widget_host_view_guest.cc	2015-04-15 00:31:22.000000000 +0200
-+++ content/browser/frame_host/render_widget_host_view_guest.cc	2015-04-18 22:10:28.000000000 +0200
-@@ -315,11 +315,11 @@
- 
- gfx::NativeViewId RenderWidgetHostViewGuest::GetNativeViewId() const {
-   if (!guest_)
--    return static_cast<gfx::NativeViewId>(NULL);
-+    return reinterpret_cast<gfx::NativeViewId>(NULL);
- 
-   RenderWidgetHostView* rwhv = guest_->GetOwnerRenderWidgetHostView();
-   if (!rwhv)
--    return static_cast<gfx::NativeViewId>(NULL);
-+    return reinterpret_cast<gfx::NativeViewId>(NULL);
-   return rwhv->GetNativeViewId();
- }
- 
 --- media/audio/audio_output_proxy_unittest.cc	2015-04-15 00:18:55.000000000 +0200
 +++ media/audio/audio_output_proxy_unittest.cc	2015-04-18 22:02:38.000000000 +0200
 @@ -387,7 +387,7 @@
@@ -167,14 +151,3 @@
  
    tasks_.erase(it, tasks_.end());
  
---- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig	2015-10-14 22:17:57.580250000 +0200
-+++ third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp	2015-10-14 22:18:13.766229000 +0200
-@@ -358,7 +358,7 @@
- {
-     RefPtr<SharedBuffer> buffer;
- 
--    SkFontTableTag tag = WTF::bswap32(table);
-+    SkFontTableTag tag = bswap32(table);
-     const size_t tableSize = m_typeface->getTableSize(tag);
-     if (tableSize) {
-         Vector<char> tableBuffer(tableSize);

Modified: head/www/chromium/files/patch-base_base.gyp
==============================================================================
--- head/www/chromium/files/patch-base_base.gyp	Fri Aug 12 16:58:34 2016	(r420137)
+++ head/www/chromium/files/patch-base_base.gyp	Fri Aug 12 18:51:46 2016	(r420138)
@@ -1,6 +1,6 @@
---- base/base.gyp.orig	2016-05-11 19:02:11 UTC
-+++ base/base.gyp
-@@ -113,7 +113,7 @@
+--- ./base/base.gyp.orig	2016-07-22 00:06:49.000000000 -0400
++++ ./base/base.gyp	2016-08-05 08:28:39.441243000 -0400
+@@ -114,7 +114,7 @@
            ],
            'link_settings': {
              'libraries': [
@@ -9,7 +9,24 @@
              ],
            },
          }],
-@@ -748,6 +748,11 @@
+@@ -286,13 +286,13 @@
+           ],
+         }],
+         ['icu_use_data_file_flag==1', {
+-          'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE'],
++          'defines': ['ICU_UTIL_DATA_IMPL=0'],
+         }, { # else icu_use_data_file_flag !=1
+           'conditions': [
+             ['OS=="win"', {
+-              'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_SHARED'],
++              'defines': ['ICU_UTIL_DATA_IMPL=1'],
+             }, {
+-              'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC'],
++              'defines': ['ICU_UTIL_DATA_IMPL=2'],
+             }],
+           ],
+         }],
+@@ -773,6 +773,11 @@
              'sync_socket_unittest.cc',
            ],
          }],

Modified: head/www/chromium/files/patch-build_common.gypi
==============================================================================
--- head/www/chromium/files/patch-build_common.gypi	Fri Aug 12 16:58:34 2016	(r420137)
+++ head/www/chromium/files/patch-build_common.gypi	Fri Aug 12 18:51:46 2016	(r420138)
@@ -1,31 +1,6 @@
---- build/common.gypi.orig	2016-05-11 19:02:12 UTC
-+++ build/common.gypi
-@@ -112,7 +112,7 @@
- 
-           'conditions': [
-             # Windows and Linux use Aura, but not Ash.
--            ['OS=="win" or OS=="linux"', {
-+            ['OS=="win" or OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-               'use_aura%': 1,
-             }],
- 
-@@ -254,13 +254,13 @@
-           }],
- 
-           # Enable HiDPI on Mac OS, Windows and Linux (including Chrome OS).
--          ['OS=="mac" or OS=="win" or OS=="linux"', {
-+          ['OS=="mac" or OS=="win" or OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-             'enable_hidpi%': 1,
-           }],
- 
-           # Enable Top Chrome Material Design on Chrome OS, Windows, and Linux,
-           # and Mac.
--          ['chromeos==1 or OS=="win" or OS=="linux" or OS=="mac"', {
-+          ['chromeos==1 or OS=="win" or OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd"', {
-             'enable_topchrome_md%': 1,
-           }],
- 
-@@ -733,6 +733,12 @@
+--- build/common.gypi.orig	2016-07-22 00:06:49.000000000 -0400
++++ build/common.gypi	2016-08-03 11:18:18.437811000 -0400
+@@ -726,6 +726,12 @@
            'os_bsd%': 0,
          }],
  
@@ -38,34 +13,7 @@
          # NSS usage.
          ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris")', {
            'use_nss_certs%': 1,
-@@ -778,7 +784,7 @@
-         }],
- 
-         # DBus usage.
--        ['OS=="linux" and embedded==0', {
-+        ['(OS=="linux" or OS=="freebsd") and embedded==0', {
-           'use_dbus%': 1,
-         }, {
-           'use_dbus%': 0,
-@@ -881,7 +887,7 @@
- 
-         # Use GPU accelerated cross process image transport by default
-         # on linux builds with the Aura window manager
--        ['use_aura==1 and OS=="linux"', {
-+        ['use_aura==1 and (OS=="linux" or OS=="freebsd" or OS=="openbsd")', {
-           'ui_compositor_image_transport%': 1,
-         }, {
-           'ui_compositor_image_transport%': 0,
-@@ -1003,7 +1009,7 @@
-         }, {
-           'use_openmax_dl_fft%': 0,
-         }],
--        ['OS=="win" or OS=="linux"', {
-+        ['OS=="win" or OS=="linux" or OS=="freebsd"', {
-           'enable_mdns%' : 1,
-         }],
- 
-@@ -1300,6 +1306,10 @@
+@@ -1303,6 +1309,10 @@
      # able to turn it off for various reasons.
      'linux_disable_pie%': 0,
  
@@ -76,7 +24,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.
-@@ -4715,6 +4725,13 @@
+@@ -4709,6 +4719,13 @@
          'ldflags': [
            '-Wl,--no-keep-memory',
          ],

Modified: head/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc
==============================================================================
--- head/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc	Fri Aug 12 16:58:34 2016	(r420137)
+++ head/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc	Fri Aug 12 18:51:46 2016	(r420138)
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/messaging/message_service.cc.orig	2016-05-21 16:16:28 UTC
-+++ chrome/browser/extensions/api/messaging/message_service.cc
-@@ -118,7 +118,7 @@ MessageService::PolicyPermission Message
+--- chrome/browser/extensions/api/messaging/message_service.cc.orig	2016-07-22 00:06:51.000000000 -0400
++++ chrome/browser/extensions/api/messaging/message_service.cc	2016-08-03 11:20:56.579570000 -0400
+@@ -119,7 +119,7 @@
  
  const char kReceivingEndDoesntExistError[] =
      "Could not establish connection. Receiving end does not exist.";
@@ -9,12 +9,12 @@
  const char kMissingPermissionError[] =
      "Access to native messaging requires nativeMessaging permission.";
  const char kProhibitedByPoliciesError[] =
-@@ -415,7 +415,7 @@ void MessageService::OpenChannelToNative
+@@ -415,7 +415,7 @@
    if (!source)
      return;
  
 -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
 +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
-   Profile* profile =
-       Profile::FromBrowserContext(source->GetProcess()->GetBrowserContext());
-   ExtensionService* extension_service =
+   content::WebContents* web_contents =
+       content::WebContents::FromRenderFrameHost(source);
+   ExtensionWebContentsObserver* extension_web_contents_observer =

Added: head/www/chromium/files/patch-chrome_browser_platform__util.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome_browser_platform__util.h	Fri Aug 12 18:51:46 2016	(r420138)
@@ -0,0 +1,11 @@
+--- chrome/browser/platform_util.h.orig	2016-08-04 11:19:03.775212000 -0400
++++ chrome/browser/platform_util.h	2016-08-04 11:19:15.839097000 -0400
+@@ -40,7 +40,7 @@
+ enum OpenItemType {
+   OPEN_FILE,
+   OPEN_FOLDER,
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   SHOW_ITEM_IN_FOLDER
+ #endif
+ };

Added: head/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome_browser_resources_safe__browsing_gen__file__type__proto.py	Fri Aug 12 18:51:46 2016	(r420138)
@@ -0,0 +1,19 @@
+--- chrome/browser/resources/safe_browsing/gen_file_type_proto.py.orig	2016-08-04 11:13:17.290964000 -0400
++++ chrome/browser/resources/safe_browsing/gen_file_type_proto.py	2016-08-04 11:13:54.901432000 -0400
+@@ -39,6 +39,7 @@
+     "android": config_pb2.DownloadFileType.PLATFORM_ANDROID,
+     "chromeos": config_pb2.DownloadFileType.PLATFORM_CHROME_OS,
+     "linux": config_pb2.DownloadFileType.PLATFORM_LINUX,
++    "freebsd": config_pb2.DownloadFileType.PLATFORM_LINUX,
+     "mac": config_pb2.DownloadFileType.PLATFORM_MAC,
+     "win": config_pb2.DownloadFileType.PLATFORM_WINDOWS,
+   }
+@@ -157,7 +158,7 @@
+                      'fix for http://crbug.com/605592')
+   parser.add_option('-t', '--type',
+                     help='The platform type. One of android, chromeos, ' +
+-                    'linux, mac, win')
++                    'linux, freebsd, mac, win')
+   parser.add_option('-i', '--infile',
+                     help='The ASCII DownloadFileType-proto file to read.')
+   parser.add_option('-o', '--outfile',

Added: head/www/chromium/files/patch-chrome_chrome__resources.gyp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-chrome_chrome__resources.gyp	Fri Aug 12 18:51:46 2016	(r420138)
@@ -0,0 +1,11 @@
+--- chrome/chrome_resources.gyp.orig	2016-08-04 11:15:29.707642000 -0400
++++ chrome/chrome_resources.gyp	2016-08-04 11:17:02.866434000 -0400
+@@ -321,6 +321,8 @@
+                 'platform': 'chromeos'
+               }, 'OS=="linux"', {
+                 'platform': 'linux'
++              }, 'OS=="freebsd"', {
++                'platform': 'freebsd'
+               }, 'OS=="mac"', {
+                 'platform': 'mac'
+               }, 'OS=="win"', {

Modified: head/www/chromium/files/patch-components_dom__distiller_core_page__features.cc
==============================================================================
--- head/www/chromium/files/patch-components_dom__distiller_core_page__features.cc	Fri Aug 12 16:58:34 2016	(r420137)
+++ head/www/chromium/files/patch-components_dom__distiller_core_page__features.cc	Fri Aug 12 18:51:46 2016	(r420138)
@@ -1,15 +1,15 @@
---- components/dom_distiller/core/page_features.cc.orig	2016-05-25 15:00:59.000000000 -0400
-+++ components/dom_distiller/core/page_features.cc	2016-05-27 10:13:11.588307000 -0400
+--- components/dom_distiller/core/page_features.cc.orig	2016-07-22 00:06:53.000000000 -0400
++++ components/dom_distiller/core/page_features.cc	2016-08-03 11:25:37.908892000 -0400
 @@ -10,7 +10,11 @@
+ #include <string>
  
  #include "base/json/json_reader.h"
- #include "base/memory/scoped_ptr.h"
 -#include "third_party/re2/src/re2/re2.h"
-+#if defined(OS_BSD)
++#if defined(OS_FREEBSD)
 +#  include <re2/re2.h>
 +#else
 +#  include "third_party/re2/src/re2/re2.h"
-+#endif // defined(OS_BSD)
++#endif  // defined(OS_FREEBSD)
  #include "url/gurl.h"
  
  namespace dom_distiller {

Modified: head/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h
==============================================================================
--- head/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h	Fri Aug 12 16:58:34 2016	(r420137)
+++ head/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h	Fri Aug 12 18:51:46 2016	(r420138)
@@ -1,6 +1,6 @@
---- components/storage_monitor/storage_monitor_freebsd.h.orig	2016-05-20 17:18:26 UTC
-+++ components/storage_monitor/storage_monitor_freebsd.h
-@@ -0,0 +1,46 @@
+--- components/storage_monitor/storage_monitor_freebsd.h.orig	2016-08-04 10:46:30.556442000 -0400
++++ components/storage_monitor/storage_monitor_freebsd.h	2016-08-04 14:57:59.255434000 -0400
+@@ -0,0 +1,45 @@
 +// Copyright 2014 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
@@ -20,7 +20,6 @@
 +#include "base/compiler_specific.h"
 +#include "base/files/file_path.h"
 +#include "base/files/file_path_watcher.h"
-+#include "base/memory/scoped_ptr.h"
 +#include "base/memory/weak_ptr.h"
 +#include "components/storage_monitor/storage_monitor.h"
 +#include "content/public/browser/browser_thread.h"

Modified: head/www/chromium/files/patch-content_browser_geolocation_wifi__data__provider__freebsd.cc
==============================================================================
--- head/www/chromium/files/patch-content_browser_geolocation_wifi__data__provider__freebsd.cc	Fri Aug 12 16:58:34 2016	(r420137)
+++ head/www/chromium/files/patch-content_browser_geolocation_wifi__data__provider__freebsd.cc	Fri Aug 12 18:51:46 2016	(r420138)
@@ -1,5 +1,5 @@
---- content/browser/geolocation/wifi_data_provider_freebsd.cc.orig	2016-05-20 17:18:26 UTC
-+++ content/browser/geolocation/wifi_data_provider_freebsd.cc
+--- content/browser/geolocation/wifi_data_provider_freebsd.cc.orig	2016-08-04 10:46:30.800769000 -0400
++++ content/browser/geolocation/wifi_data_provider_freebsd.cc	2016-08-04 21:41:58.417450000 -0400
 @@ -0,0 +1,201 @@
 +// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
@@ -187,7 +187,7 @@
 +
 +WifiDataProviderCommon::WlanApiInterface* WifiDataProviderFreeBSD::NewWlanApi() {
 +
-+	scoped_ptr<AccessPointDataFreeBSD> wlan_api(new AccessPointDataFreeBSD);
++	std::unique_ptr<AccessPointDataFreeBSD> wlan_api(new AccessPointDataFreeBSD);
 +	if (wlan_api->Init())
 +		return wlan_api.release();
 +

Modified: head/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc
==============================================================================
--- head/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc	Fri Aug 12 16:58:34 2016	(r420137)
+++ head/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc	Fri Aug 12 18:51:46 2016	(r420138)
@@ -1,6 +1,6 @@
---- content/browser/gpu/gpu_internals_ui.cc.orig	2016-05-11 19:02:20 UTC
-+++ content/browser/gpu/gpu_internals_ui.cc
-@@ -37,7 +37,7 @@
+--- content/browser/gpu/gpu_internals_ui.cc.orig	2016-07-22 00:06:54.000000000 -0400
++++ content/browser/gpu/gpu_internals_ui.cc	2016-08-03 12:29:59.399353000 -0400
+@@ -39,7 +39,7 @@
  #include "third_party/angle/src/common/version.h"
  #include "ui/gl/gpu_switching_manager.h"
  
@@ -9,16 +9,16 @@
  #include <X11/Xlib.h>
  #endif
  #if defined(OS_WIN)
-@@ -45,7 +45,7 @@
+@@ -47,7 +47,7 @@
  #include "ui/gfx/win/physical_size.h"
  #endif
  
 -#if defined(OS_LINUX) && defined(USE_X11)
 +#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(USE_X11)
- #include "ui/base/x/x11_util.h"
- #include "ui/gfx/x/x11_atom_cache.h"
+ #include "ui/base/x/x11_util.h"       // nogncheck
+ #include "ui/gfx/x/x11_atom_cache.h"  // nogncheck
  #endif
-@@ -198,7 +198,7 @@ base::DictionaryValue* GpuInfoAsDictiona
+@@ -200,7 +200,7 @@
                                               gpu_info.gl_ws_version));
    basic_info->Append(NewDescriptionValuePair("Window system binding extensions",
                                               gpu_info.gl_ws_extensions));

Modified: head/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
==============================================================================
--- head/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc	Fri Aug 12 16:58:34 2016	(r420137)
+++ head/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc	Fri Aug 12 18:51:46 2016	(r420138)
@@ -1,7 +1,7 @@
---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2016-05-11 19:02:20 UTC
-+++ content/browser/renderer_host/render_widget_host_view_aura.cc
-@@ -107,7 +107,7 @@
- #include "ui/gfx/win/dpi.h"
+--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2016-07-22 00:06:54.000000000 -0400
++++ content/browser/renderer_host/render_widget_host_view_aura.cc	2016-08-03 12:34:00.357612000 -0400
+@@ -105,7 +105,7 @@
+ #include "ui/gfx/gdi_util.h"
  #endif
  
 -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
@@ -9,16 +9,7 @@
  #include "content/common/input_messages.h"
  #include "ui/events/linux/text_edit_command_auralinux.h"
  #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h"
-@@ -734,7 +734,7 @@ gfx::NativeViewId RenderWidgetHostViewAu
-   if (host)
-     return reinterpret_cast<gfx::NativeViewId>(host->GetAcceleratedWidget());
- #endif
--  return static_cast<gfx::NativeViewId>(NULL);
-+  return static_cast<gfx::NativeViewId>(0);
- }
- 
- gfx::NativeViewAccessible RenderWidgetHostViewAura::GetNativeViewAccessible() {
-@@ -2626,7 +2626,7 @@ bool RenderWidgetHostViewAura::NeedsInpu
+@@ -2376,7 +2376,7 @@
  }
  
  bool RenderWidgetHostViewAura::NeedsMouseCapture() {
@@ -27,7 +18,7 @@
    return NeedsInputGrab();
  #endif
    return false;
-@@ -2859,7 +2859,7 @@ void RenderWidgetHostViewAura::ForwardKe
+@@ -2608,7 +2608,7 @@
    if (!target_host)
      return;
  

Modified: head/www/chromium/files/patch-content_gpu_gpu__main.cc
==============================================================================
--- head/www/chromium/files/patch-content_gpu_gpu__main.cc	Fri Aug 12 16:58:34 2016	(r420137)
+++ head/www/chromium/files/patch-content_gpu_gpu__main.cc	Fri Aug 12 18:51:46 2016	(r420138)
@@ -1,6 +1,6 @@
---- content/gpu/gpu_main.cc.orig	2016-05-11 19:02:21 UTC
-+++ content/gpu/gpu_main.cc
-@@ -99,7 +99,7 @@ void GetGpuInfoFromCommandLine(gpu::GPUI
+--- content/gpu/gpu_main.cc.orig	2016-07-22 00:06:54.000000000 -0400
++++ content/gpu/gpu_main.cc	2016-08-03 12:37:05.590978000 -0400
+@@ -102,7 +102,7 @@
                                 const base::CommandLine& command_line);
  bool WarmUpSandbox(const base::CommandLine& command_line);
  
@@ -9,7 +9,7 @@
  bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info);
  #endif
  
-@@ -187,13 +187,13 @@ int GpuMain(const MainFunctionParams& pa
+@@ -192,13 +192,13 @@
    // Use a UI message loop because ANGLE and the desktop GL platform can
    // create child windows to render to.
    base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI);
@@ -18,14 +18,14 @@
    // We need a UI loop so that we can grab the Expose events. See GLSurfaceGLX
    // and https://crbug.com/326995.
    base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI);
-   scoped_ptr<ui::PlatformEventSource> event_source =
+   std::unique_ptr<ui::PlatformEventSource> event_source =
        ui::PlatformEventSource::CreateDefault();
 -#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
++#elif (defined(OS_LINUX) || defined(OS_BSD))
    base::MessageLoop main_message_loop(base::MessageLoop::TYPE_DEFAULT);
  #elif defined(OS_MACOSX)
    // This is necessary for CoreAnimation layers hosted in the GPU process to be
-@@ -304,7 +304,7 @@ int GpuMain(const MainFunctionParams& pa
+@@ -309,7 +309,7 @@
        // and we already registered them through SetGpuInfo() above.
        base::TimeTicks before_collect_context_graphics_info =
            base::TimeTicks::Now();
@@ -34,7 +34,7 @@
        if (!CollectGraphicsInfo(gpu_info))
          dead_on_arrival = true;
  
-@@ -467,7 +467,7 @@ bool WarmUpSandbox(const base::CommandLi
+@@ -491,7 +491,7 @@
    return true;
  }
  

Added: head/www/chromium/files/patch-content_renderer_media_webrtc__audio__renderer.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-content_renderer_media_webrtc__audio__renderer.cc	Fri Aug 12 18:51:46 2016	(r420138)
@@ -0,0 +1,11 @@
+--- content/renderer/media/webrtc_audio_renderer.cc.orig	2016-06-08 12:04:14.328279000 -0400
++++ content/renderer/media/webrtc_audio_renderer.cc	2016-06-08 12:04:28.210758000 -0400
+@@ -162,7 +162,7 @@
+   // Windows below.
+   int frames_per_buffer = hardware_buffer_size;
+ 
+-#if defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
+   // On Linux and MacOS, the low level IO implementations on the browser side
+   // supports all buffer size the clients want. We use the native peer
+   // connection buffer size (10ms) to achieve best possible performance.

Added: head/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-content_renderer_media_webrtc_processed__local__audio__source.cc	Fri Aug 12 18:51:46 2016	(r420138)
@@ -0,0 +1,11 @@
+--- ./content/renderer/media/webrtc/processed_local_audio_source.cc.orig	2016-08-03 12:48:04.721257000 -0400
++++ ./content/renderer/media/webrtc/processed_local_audio_source.cc	2016-08-03 12:48:34.201210000 -0400
+@@ -269,7 +269,7 @@
+                                         bool key_pressed) {
+ #if defined(OS_WIN) || defined(OS_MACOSX)
+   DCHECK_LE(volume, 1.0);
+-#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_OPENBSD)
++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+   // We have a special situation on Linux where the microphone volume can be
+   // "higher than maximum". The input volume slider in the sound preference
+   // allows the user to set a scaling that is higher than 100%. It means that

Modified: head/www/chromium/files/patch-content_renderer_render__thread__impl.cc
==============================================================================
--- head/www/chromium/files/patch-content_renderer_render__thread__impl.cc	Fri Aug 12 16:58:34 2016	(r420137)
+++ head/www/chromium/files/patch-content_renderer_render__thread__impl.cc	Fri Aug 12 18:51:46 2016	(r420138)
@@ -1,11 +1,11 @@
---- content/renderer/render_thread_impl.cc.orig	2016-05-25 15:01:02.000000000 -0400
-+++ content/renderer/render_thread_impl.cc	2016-05-27 11:01:14.634236000 -0400
-@@ -1468,7 +1468,7 @@
-     const bool enable_video_accelerator =
-         !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode);
-     const bool enable_gpu_memory_buffer_video_frames =
+--- content/renderer/render_thread_impl.cc.orig	2016-07-22 00:06:54.000000000 -0400
++++ content/renderer/render_thread_impl.cc	2016-08-03 14:17:16.736255000 -0400
+@@ -1424,7 +1424,7 @@
+   const bool enable_video_accelerator =
+       !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode);
+   const bool enable_gpu_memory_buffer_video_frames =
 -#if defined(OS_MACOSX) || defined(OS_LINUX)
 +#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
-         !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames) &&
-         !cmd_line->HasSwitch(switches::kDisableGpuCompositing) &&
-         !gpu_channel_host->gpu_info().software_rendering;
+       !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames) &&
+       !cmd_line->HasSwitch(switches::kDisableGpuCompositing) &&
+       !gpu_channel_host->gpu_info().software_rendering;

Modified: head/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc
==============================================================================
--- head/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc	Fri Aug 12 16:58:34 2016	(r420137)
+++ head/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc	Fri Aug 12 18:51:46 2016	(r420138)
@@ -1,5 +1,5 @@
---- content/shell/browser/shell_browser_context.cc.orig	2016-05-11 19:02:22 UTC
-+++ content/shell/browser/shell_browser_context.cc
+--- content/shell/browser/shell_browser_context.cc.orig	2016-07-22 00:06:54.000000000 -0400
++++ content/shell/browser/shell_browser_context.cc	2016-08-03 15:17:20.501518000 -0400
 @@ -24,7 +24,7 @@
  
  #if defined(OS_WIN)
@@ -9,12 +9,12 @@
  #include "base/nix/xdg_util.h"
  #elif defined(OS_MACOSX)
  #include "base/base_paths_mac.h"
-@@ -79,7 +79,7 @@ void ShellBrowserContext::InitWhileIOAll
+@@ -80,7 +80,7 @@
  #if defined(OS_WIN)
    CHECK(PathService::Get(base::DIR_LOCAL_APP_DATA, &path_));
    path_ = path_.Append(std::wstring(L"content_shell"));
 -#elif defined(OS_LINUX)
 +#elif defined(OS_LINUX) || defined(OS_BSD)
-   scoped_ptr<base::Environment> env(base::Environment::Create());
+   std::unique_ptr<base::Environment> env(base::Environment::Create());
    base::FilePath config_dir(
        base::nix::GetXDGDirectory(env.get(),

Modified: head/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc
==============================================================================
--- head/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc	Fri Aug 12 16:58:34 2016	(r420137)
+++ head/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc	Fri Aug 12 18:51:46 2016	(r420138)
@@ -1,11 +1,11 @@
---- extensions/browser/api/serial/serial_api.cc.orig	2016-05-25 15:01:02.000000000 -0400
-+++ extensions/browser/api/serial/serial_api.cc	2016-05-27 11:12:01.060235000 -0400
+--- extensions/browser/api/serial/serial_api.cc.orig	2016-07-22 00:06:55.000000000 -0400
++++ extensions/browser/api/serial/serial_api.cc	2016-08-03 15:23:41.022195000 -0400
 @@ -86,11 +86,13 @@
  void SerialGetDevicesFunction::Work() {
    DCHECK_CURRENTLY_ON(BrowserThread::FILE);
  
 +#if !defined(OS_BSD)
-   scoped_ptr<device::SerialDeviceEnumerator> enumerator =
+   std::unique_ptr<device::SerialDeviceEnumerator> enumerator =
        device::SerialDeviceEnumerator::Create();
    mojo::Array<device::serial::DeviceInfoPtr> devices = enumerator->GetDevices();
    results_ = serial::GetDevices::Results::Create(

Modified: head/www/chromium/files/patch-media_audio_audio__manager.cc
==============================================================================
--- head/www/chromium/files/patch-media_audio_audio__manager.cc	Fri Aug 12 16:58:34 2016	(r420137)
+++ head/www/chromium/files/patch-media_audio_audio__manager.cc	Fri Aug 12 18:51:46 2016	(r420138)
@@ -1,16 +1,16 @@
---- media/audio/audio_manager.cc.orig	2016-05-11 19:02:23 UTC
-+++ media/audio/audio_manager.cc
-@@ -193,7 +193,7 @@ class AudioManagerHelper : public base::
+--- media/audio/audio_manager.cc.orig	2016-07-22 00:06:55.000000000 -0400
++++ media/audio/audio_manager.cc	2016-08-03 15:25:47.683860000 -0400
+@@ -92,7 +92,7 @@
    }
  #endif
  
 -#if defined(OS_LINUX)
 +#if defined(OS_LINUX) || defined(OS_FREEBSD)
-   void set_app_name(const std::string& app_name) {
-     app_name_ = app_name;
-   }
-@@ -243,7 +243,7 @@ class AudioManagerHelper : public base::
-   scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_for_testing_;
+   void set_app_name(const std::string& app_name) { app_name_ = app_name; }
+   const std::string& app_name() const { return app_name_; }
+ #endif
+@@ -250,7 +250,7 @@
+   std::unique_ptr<base::win::ScopedCOMInitializer> com_initializer_for_testing_;
  #endif
  
 -#if defined(OS_LINUX)
@@ -18,7 +18,7 @@
    std::string app_name_;
  #endif
  
-@@ -321,7 +321,7 @@ void AudioManager::EnableCrashKeyLogging
+@@ -359,7 +359,7 @@
    g_helper.Pointer()->enable_crash_key_logging();
  }
  

Modified: head/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc
==============================================================================
--- head/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc	Fri Aug 12 16:58:34 2016	(r420137)
+++ head/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc	Fri Aug 12 18:51:46 2016	(r420138)
@@ -1,6 +1,6 @@
---- media/capture/video/linux/video_capture_device_linux.cc.orig	2016-05-11 19:02:23 UTC
-+++ media/capture/video/linux/video_capture_device_linux.cc
-@@ -44,6 +44,7 @@ static bool ReadIdFile(const std::string
+--- media/capture/video/linux/video_capture_device_linux.cc.orig	2016-07-22 00:06:55.000000000 -0400
++++ media/capture/video/linux/video_capture_device_linux.cc	2016-08-04 15:59:29.808311000 -0400
+@@ -44,6 +44,7 @@
    return true;
  }
  
@@ -8,7 +8,7 @@
  // Translates Video4Linux pixel formats to Chromium pixel formats.
  // static
  VideoPixelFormat VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat(
-@@ -57,6 +58,7 @@ std::list<uint32_t> VideoCaptureDeviceLi
+@@ -57,6 +58,7 @@
      bool favour_mjpeg) {
    return V4L2CaptureDelegate::GetListOfUsableFourCcs(favour_mjpeg);
  }
@@ -16,29 +16,29 @@
  
  const std::string VideoCaptureDevice::Name::GetModel() const {
    // |unique_id| is of the form "/dev/video2".  |file_name| is "video2".
-@@ -90,6 +92,7 @@ VideoCaptureDeviceLinux::~VideoCaptureDe
+@@ -90,6 +92,7 @@
    v4l2_thread_.Stop();
  }
  
 +#if !defined(OS_FREEBSD)
  void VideoCaptureDeviceLinux::AllocateAndStart(
      const VideoCaptureParams& params,
-     scoped_ptr<VideoCaptureDevice::Client> client) {
-@@ -113,7 +116,13 @@ void VideoCaptureDeviceLinux::AllocateAn
+     std::unique_ptr<VideoCaptureDevice::Client> client) {
+@@ -113,7 +116,13 @@
                   params.requested_format.frame_size.height(),
                   params.requested_format.frame_rate, base::Passed(&client)));
  }
 +#else // !defined(OS_FREEBSD)
 +void VideoCaptureDeviceLinux::AllocateAndStart(
 +    const VideoCaptureParams& params,
-+    scoped_ptr<VideoCaptureDevice::Client> client) {}
++    std::unique_ptr<VideoCaptureDevice::Client> client) {}
 +#endif // !defined(OS_FREEBSD)
  
 +#if !defined(OS_FREEBSD)
  void VideoCaptureDeviceLinux::StopAndDeAllocate() {
    if (!v4l2_thread_.IsRunning())
      return;  // Wrong state.
-@@ -124,7 +133,11 @@ void VideoCaptureDeviceLinux::StopAndDeA
+@@ -124,7 +133,11 @@
  
    capture_impl_ = NULL;
  }
@@ -50,7 +50,7 @@
  void VideoCaptureDeviceLinux::SetRotation(int rotation) {
    if (v4l2_thread_.IsRunning()) {
      v4l2_thread_.message_loop()->PostTask(
-@@ -132,6 +145,9 @@ void VideoCaptureDeviceLinux::SetRotatio
+@@ -132,6 +145,9 @@
          base::Bind(&V4L2CaptureDelegate::SetRotation, capture_impl_, rotation));
    }
  }

Modified: head/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc
==============================================================================
--- head/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc	Fri Aug 12 16:58:34 2016	(r420137)
+++ head/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc	Fri Aug 12 18:51:46 2016	(r420138)
@@ -1,18 +1,18 @@
---- media/capture/video/video_capture_device_factory.cc.orig	2016-05-11 19:02:23 UTC
-+++ media/capture/video/video_capture_device_factory.cc
-@@ -17,6 +17,10 @@ namespace media {
- // static
- scoped_ptr<VideoCaptureDeviceFactory> VideoCaptureDeviceFactory::CreateFactory(
+--- media/capture/video/video_capture_device_factory.cc.orig	2016-07-22 00:06:55.000000000 -0400
++++ media/capture/video/video_capture_device_factory.cc	2016-08-04 16:01:12.907434000 -0400
+@@ -18,6 +18,10 @@
+ std::unique_ptr<VideoCaptureDeviceFactory>
+ VideoCaptureDeviceFactory::CreateFactory(
      scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
 +#if defined(OS_BSD)
-+  return scoped_ptr<VideoCaptureDeviceFactory>(new
++  return std::unique_ptr<VideoCaptureDeviceFactory>(new
 +      media::FakeVideoCaptureDeviceFactory());
 +#else
    const base::CommandLine* command_line =
        base::CommandLine::ForCurrentProcess();
    // Use a Fake or File Video Device Factory if the command line flags are
-@@ -35,6 +39,7 @@ scoped_ptr<VideoCaptureDeviceFactory> Vi
-     return scoped_ptr<VideoCaptureDeviceFactory>(
+@@ -36,6 +40,7 @@
+     return std::unique_ptr<VideoCaptureDeviceFactory>(
          CreateVideoCaptureDeviceFactory(ui_task_runner));
    }
 +#endif

Modified: head/www/chromium/files/patch-net_base_address__tracker__linux.h
==============================================================================
--- head/www/chromium/files/patch-net_base_address__tracker__linux.h	Fri Aug 12 16:58:34 2016	(r420137)
+++ head/www/chromium/files/patch-net_base_address__tracker__linux.h	Fri Aug 12 18:51:46 2016	(r420138)
@@ -1,10 +1,10 @@
---- net/base/address_tracker_linux.h.orig	2016-05-25 15:01:03.000000000 -0400
-+++ net/base/address_tracker_linux.h	2016-05-27 11:17:51.228810000 -0400
+--- net/base/address_tracker_linux.h.orig	2016-07-22 00:06:56.000000000 -0400
++++ net/base/address_tracker_linux.h	2016-08-04 16:22:00.122898000 -0400
 @@ -6,10 +6,12 @@
  #define NET_BASE_ADDRESS_TRACKER_LINUX_H_
  
  #include <sys/socket.h>  // Needed to include netlink.
-+#if !defined(OS_FREEBSD)
++#if !defined(__FreeBSD__)
  // Mask superfluous definition of |struct net|. This is fixed in Linux 2.6.38.
  #define net net_kernel
  #include <linux/rtnetlink.h>
@@ -17,7 +17,7 @@
  class NET_EXPORT_PRIVATE AddressTrackerLinux :
      public base::MessageLoopForIO::Watcher {
   public:
-+#if !defined(OS_FREEBSD)
++#if !defined(__FreeBSD__)
    typedef std::map<IPAddress, struct ifaddrmsg> AddressMap;
 -
 +#else

Modified: head/www/chromium/files/patch-net_proxy_proxy__service.cc
==============================================================================
--- head/www/chromium/files/patch-net_proxy_proxy__service.cc	Fri Aug 12 16:58:34 2016	(r420137)
+++ head/www/chromium/files/patch-net_proxy_proxy__service.cc	Fri Aug 12 18:51:46 2016	(r420138)
@@ -1,6 +1,6 @@
---- net/proxy/proxy_service.cc.orig	2016-05-11 19:02:24 UTC
-+++ net/proxy/proxy_service.cc
-@@ -47,7 +47,7 @@
+--- net/proxy/proxy_service.cc.orig	2016-07-22 00:06:56.000000000 -0400
++++ net/proxy/proxy_service.cc	2016-08-03 15:29:21.017256000 -0400
+@@ -48,7 +48,7 @@
  #elif defined(OS_MACOSX)
  #include "net/proxy/proxy_config_service_mac.h"
  #include "net/proxy/proxy_resolver_mac.h"
@@ -9,12 +9,12 @@
  #include "net/proxy/proxy_config_service_linux.h"
  #elif defined(OS_ANDROID)
  #include "net/proxy/proxy_config_service_android.h"
-@@ -1503,7 +1503,7 @@ scoped_ptr<ProxyConfigService> ProxyServ
+@@ -1542,7 +1542,7 @@
               << "profile_io_data.cc::CreateProxyConfigService and this should "
               << "be used only for examples.";
-   return make_scoped_ptr(new UnsetProxyConfigService);
+   return base::WrapUnique(new UnsetProxyConfigService);
 -#elif defined(OS_LINUX)
 +#elif defined(OS_LINUX) || defined(OS_FREEBSD)
-   scoped_ptr<ProxyConfigServiceLinux> linux_config_service(
+   std::unique_ptr<ProxyConfigServiceLinux> linux_config_service(
        new ProxyConfigServiceLinux());
  

Added: head/www/chromium/files/patch-services_shell_public_cpp_lib_initialize__base__and__icu.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-services_shell_public_cpp_lib_initialize__base__and__icu.cc	Fri Aug 12 18:51:46 2016	(r420138)
@@ -0,0 +1,18 @@
+--- services/shell/public/cpp/lib/initialize_base_and_icu.cc.orig	2016-08-05 14:07:55.178818000 -0400
++++ services/shell/public/cpp/lib/initialize_base_and_icu.cc	2016-08-05 14:08:22.862094000 -0400
+@@ -35,6 +35,7 @@
+   base::SysInfo::MaxSharedMemorySize();
+ #endif
+ 
++#if !defined(__FreeBSD__)
+ #if ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE
+   // Initialize core ICU. We must perform the full initialization before we
+   // initialize icu::TimeZone subsystem because otherwise ICU gets in a state
+@@ -42,6 +43,7 @@
+   // cause crashes.
+   CHECK(base::i18n::InitializeICUFromRawMemory(icu_data));
+ #endif  // ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE
++#endif
+ 
+ #if !defined(OS_ANDROID)
+   // ICU DateFormat class (used in base/time_format.cc) needs to get the

Added: head/www/chromium/files/patch-services_shell_runner_init.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-services_shell_runner_init.cc	Fri Aug 12 18:51:46 2016	(r420138)
@@ -0,0 +1,18 @@
+--- services/shell/runner/init.cc.orig	2016-08-05 14:09:25.990401000 -0400
++++ services/shell/runner/init.cc	2016-08-05 14:09:42.644514000 -0400
+@@ -77,6 +77,7 @@
+ void CallLibraryEarlyInitialization(base::NativeLibrary app_library) {
+   // Do whatever warming that the mojo application wants.
+ 
++#if !defined(__FreeBSD__)
+ #if ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE
+   typedef void (*LibraryEarlyInitFunction)(const uint8_t*);
+   LibraryEarlyInitFunction init_function =
+@@ -90,6 +91,7 @@
+     init_function(icu_data);
+   }
+ #endif  // ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE
++#endif
+ 
+   // TODO(erg): All chromium binaries load base. We might want to make a
+   // general system for other people.

Added: head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.cpp	Fri Aug 12 18:51:46 2016	(r420138)
@@ -0,0 +1,47 @@
+--- third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp.orig	2016-08-04 11:20:01.382167000 -0400
++++ third_party/WebKit/Source/platform/fonts/FontPlatformData.cpp	2016-08-04 11:21:00.605035000 -0400
+@@ -93,7 +93,7 @@
+     , m_syntheticBold(source.m_syntheticBold)
+     , m_syntheticItalic(source.m_syntheticItalic)
+     , m_orientation(source.m_orientation)
+-#if OS(LINUX) || OS(ANDROID)
++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD)
+     , m_style(source.m_style)
+ #endif
+     , m_harfBuzzFace(nullptr)
+@@ -115,7 +115,7 @@
+     , m_syntheticBold(src.m_syntheticBold)
+     , m_syntheticItalic(src.m_syntheticItalic)
+     , m_orientation(src.m_orientation)
+-#if OS(LINUX) || OS(ANDROID)
++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD)
+     , m_style(FontRenderStyle::querySystem(m_family, m_textSize, m_typeface->style()))
+ #endif
+     , m_harfBuzzFace(nullptr)
+@@ -142,7 +142,7 @@
+     , m_syntheticBold(syntheticBold)
+     , m_syntheticItalic(syntheticItalic)
+     , m_orientation(orientation)
+-#if OS(LINUX) || OS(ANDROID)
++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD)
+     , m_style(FontRenderStyle::querySystem(m_family, m_textSize, m_typeface->style()))
+ #endif
+     , m_isHashTableDeletedValue(false)
+@@ -188,7 +188,7 @@
+     m_syntheticItalic = other.m_syntheticItalic;
+     m_harfBuzzFace = nullptr;
+     m_orientation = other.m_orientation;
+-#if OS(LINUX) || OS(ANDROID)
++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD)
+     m_style = other.m_style;
+ #endif
+ 
+@@ -216,7 +216,7 @@
+         && m_isHashTableDeletedValue == a.m_isHashTableDeletedValue
+         && m_syntheticBold == a.m_syntheticBold
+         && m_syntheticItalic == a.m_syntheticItalic
+-#if OS(LINUX) || OS(ANDROID)
++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD)
+         && m_style == a.m_style
+ #endif
+         && m_orientation == a.m_orientation;

Added: head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontPlatformData.h	Fri Aug 12 18:51:46 2016	(r420138)
@@ -0,0 +1,32 @@
+--- third_party/WebKit/Source/platform/fonts/FontPlatformData.h.orig	2016-08-04 11:21:45.907982000 -0400
++++ third_party/WebKit/Source/platform/fonts/FontPlatformData.h	2016-08-04 11:22:32.571069000 -0400
+@@ -46,9 +46,9 @@
+ #include "wtf/text/CString.h"
+ #include "wtf/text/StringImpl.h"
+ 
+-#if OS(LINUX) || OS(ANDROID)
++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD)
+ #include "platform/fonts/linux/FontRenderStyle.h"
+-#endif // OS(LINUX) || OS(ANDROID)
++#endif // OS(LINUX) || OS(ANDROID) || OS(FREEBSD)
+ 
+ #if OS(MACOSX)
+ OBJC_CLASS NSFont;
+@@ -126,7 +126,7 @@
+     PassRefPtr<OpenTypeVerticalData> verticalData() const;
+     PassRefPtr<SharedBuffer> openTypeTable(SkFontTableTag) const;
+ 
+-#if OS(LINUX) || OS(ANDROID)
++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD)
+     // The returned styles are all actual styles without FontRenderStyle::NoPreference.
+     const FontRenderStyle& getFontRenderStyle() const { return m_style; }
+ #endif
+@@ -152,7 +152,7 @@
+     bool m_syntheticItalic;
+     FontOrientation m_orientation;
+ private:
+-#if OS(LINUX) || OS(ANDROID)
++#if OS(LINUX) || OS(ANDROID) || OS(FREEBSD)
+     FontRenderStyle m_style;
+ #endif
+ 

Modified: head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp
==============================================================================
--- head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp	Fri Aug 12 16:58:34 2016	(r420137)
+++ head/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp	Fri Aug 12 18:51:46 2016	(r420138)
@@ -1,5 +1,5 @@
---- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig	2016-05-25 15:01:11.000000000 -0400
-+++ third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp	2016-05-27 11:26:01.202711000 -0400
+--- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig	2016-07-22 00:07:09.000000000 -0400
++++ third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp	2016-08-03 15:39:36.482884000 -0400
 @@ -60,7 +60,7 @@
  
  namespace blink {
@@ -9,21 +9,12 @@
  // Android special locale for retrieving the color emoji font
  // based on the proposed changes in UTR #51 for introducing
  // an Emoji script code:
-@@ -171,7 +171,7 @@
-     return fontDataFromFontPlatformData(fontPlatformData, shouldRetain);
- }
- 
--#if OS(WIN) || OS(LINUX)
-+#if OS(WIN) || OS(LINUX) || OS(FREEBSD)
- static inline SkFontStyle fontStyle(const FontDescription& fontDescription)
- {
-     int width = static_cast<int>(fontDescription.stretch());
-@@ -232,7 +232,7 @@
+@@ -183,7 +183,7 @@
      }
  #endif
  
--#if OS(LINUX)
-+#if OS(LINUX) || OS(FREEBSD)
+-#if OS(LINUX) || OS(WIN)
++#if OS(LINUX) || OS(WIN) || OS(FREEBSD)
      // On linux if the fontManager has been overridden then we should be calling the embedder
      // provided font Manager rather than calling SkTypeface::CreateFromName which may redirect the
      // call to the default font Manager.

Added: head/www/chromium/files/patch-third__party_pdfium_build__gyp_standalone.gypi
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/www/chromium/files/patch-third__party_pdfium_build__gyp_standalone.gypi	Fri Aug 12 18:51:46 2016	(r420138)
@@ -0,0 +1,38 @@
+--- third_party/pdfium/build_gyp/standalone.gypi.orig	2016-08-03 16:25:54.875923000 -0400
++++ third_party/pdfium/build_gyp/standalone.gypi	2016-08-03 16:28:57.583883000 -0400
+@@ -19,7 +19,7 @@
+       'variables': {
+         'variables': {
+           'conditions': [
+-            ['OS=="linux" or OS=="mac"', {
++            ['OS=="linux" or OS=="mac" or OS=="freebsd"', {
+               # This handles the Unix platforms we generally deal with.
+               # Anything else gets passed through, which probably won't work
+               # very well; such hosts should pass an explicit target_arch
+@@ -32,7 +32,7 @@
+                                        s/aarch64/arm64/;\
+                                        s/mips.*/mipsel/")',
+             }, {
+-              # OS!="linux" and OS!="mac"
++              # OS!="linux" and OS!="mac" and OS!="freebsd"
+               'host_arch%': 'ia32',
+             }],
+           ],
+@@ -59,7 +59,7 @@
+       }, {
+         'os_posix%': 1,
+       }],
+-      ['OS=="linux" or OS=="mac"', {
++      ['OS=="linux" or OS=="mac" or OS=="freebsd"', {
+         'clang%': 1,
+         'host_clang%': 1,
+       }, {
+@@ -141,7 +141,7 @@
+           },
+         },
+         'conditions': [
+-          ['OS=="linux"', {
++          ['OS=="linux" or OS=="freebsd"', {
+             'cflags': [
+               '-fdata-sections',
+               '-ffunction-sections',

Modified: head/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp
==============================================================================
--- head/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp	Fri Aug 12 16:58:34 2016	(r420137)
+++ head/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp	Fri Aug 12 18:51:46 2016	(r420138)
@@ -1,8 +1,8 @@
---- third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp.orig	2016-05-27 13:05:16.571632000 -0400
-+++ third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp	2016-05-27 13:32:36.441412000 -0400
-@@ -61,6 +61,103 @@
-     L"May",       L"June",     L"July",     L"August",
-     L"September", L"October",  L"November", L"December"};
+--- third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp.orig	2016-07-22 00:09:02.000000000 -0400
++++ third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp	2016-08-03 16:33:48.931305000 -0400
+@@ -62,6 +62,103 @@
+                                       L"July",    L"August",   L"September",
+                                       L"October", L"November", L"December"};
  
 +#if defined(__FreeBSD__)
 +/*
@@ -101,6 +101,6 @@
 +}

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608121851.u7CIpkxh069977>