Index: branches/2018Q3/www/chromium/Makefile
===================================================================
--- branches/2018Q3/www/chromium/Makefile	(revision 477308)
+++ branches/2018Q3/www/chromium/Makefile	(revision 477309)
@@ -1,313 +1,311 @@
 # Created by: Florent Thoumie <flz@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	chromium
-PORTVERSION=	68.0.3440.84
-PORTREVISION=	1
+PORTVERSION=	68.0.3440.106
 CATEGORIES?=	www
 MASTER_SITES=	https://commondatastorage.googleapis.com/chromium-browser-official/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER?=	chromium@FreeBSD.org
 COMMENT?=	Google web browser based on WebKit
 
 LICENSE=	BSD3CLAUSE LGPL21 MPL11
 LICENSE_COMB=	multi
 
 BUILD_DEPENDS=	bash:shells/bash \
 		${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \
 
 .if !defined(GN_ONLY)
 BUILD_DEPENDS+=	gperf:devel/gperf \
 		yasm:devel/yasm \
 		ffmpeg>=3.2.2,1:multimedia/ffmpeg \
 		flock:sysutils/flock \
 		node:www/node \
 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
 		${LOCALBASE}/share/usbids/usb.ids:misc/usbids \
 		${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR}
 .endif
 
 .if !defined(GN_ONLY)
 LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-atk \
 		libspeechd.so:accessibility/speech-dispatcher \
 		libsnappy.so:archivers/snappy \
 		libFLAC.so:audio/flac \
 		libopus.so:audio/opus \
 		libspeex.so:audio/speex \
 		libdbus-1.so:devel/dbus \
 		libdbus-glib-1.so:devel/dbus-glib \
 		libicuuc.so:devel/icu \
 		libjsoncpp.so:devel/jsoncpp \
 		libpci.so:devel/libpci \
 		libnspr4.so:devel/nspr \
 		libre2.so:devel/re2 \
 		libcairo.so:graphics/cairo \
 		libdrm.so:graphics/libdrm \
 		libexif.so:graphics/libexif \
 		libpng.so:graphics/png \
 		libwebp.so:graphics/webp \
 		libavcodec.so:multimedia/ffmpeg \
 		libopenh264.so:multimedia/openh264 \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libgcrypt.so:security/libgcrypt \
 		libsecret-1.so:security/libsecret \
 		libnss3.so:security/nss \
 		libexpat.so:textproc/expat2 \
 		libfontconfig.so:x11-fonts/fontconfig
 
 RUN_DEPENDS=	xdg-open:devel/xdg-utils \
 		noto-lite>0:x11-fonts/noto-lite
 
 BROKEN_FreeBSD_11_aarch64=	components/safe_browsing_db/v4_rice.cc:120:18: use of overloaded operator '&' is ambiguous
 ONLY_FOR_ARCHS=			aarch64 amd64 i386
 
 .endif
 
 .if defined(GN_ONLY)
 USES=		compiler:c++14-lang ninja pkgconfig python:2.7,build shebangfix tar:xz
 .else
 USES=		bison cpe desktop-file-utils jpeg ninja perl5 pkgconfig \
 		python:2.7,build shebangfix tar:xz
 .endif
 MAKE_ARGS=	-C out/${BUILDTYPE}
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
 .if !defined(GN_ONLY)
 CPE_VENDOR=	google
 CPE_PRODUCT=	chrome
 USE_GL=		gl
 USE_LDCONFIG=	${DATADIR}
 USE_PERL5=	build
 USE_XORG=	scrnsaverproto x11 xcb xcomposite xcursor xext xdamage xfixes xi \
 		xproto xrandr xrender xscrnsaver xtst
 USE_GNOME=	atk dconf glib20 gtk30 libxml2 libxslt
 SHEBANG_FILES=	chrome/tools/build/linux/chrome-wrapper
 ALL_TARGET=	chrome
 INSTALLS_ICONS=	yes
 
 .endif
 
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clang
 
 # TODO bz@ : install libwidevinecdm.so (see third_party/widevine/cdm/BUILD.gn)
 #
 # Run "./out/${BUILDTYPE}/gn args out/${BUILDTYPE} --list" for all variables.
 # Some parts don't have use_system_* flag, and can be turned on/off by using
 # replace_gn_files.py script, some parts just turned on/off for target host
 # OS "target_os == is_bsd", like libusb, libpci.
 GN_ARGS+=	clang_use_chrome_plugins=false \
 		enable_nacl=false \
 		enable_one_click_signin=true \
 		enable_remoting=false \
 		fieldtrial_testing_like_official_build=true \
 		is_clang=true \
 		toolkit_views=true \
 		treat_warnings_as_errors=false \
 		use_allocator="none" \
 		use_allocator_shim=false \
 		use_aura=true \
 		use_bundled_fontconfig=false \
 		use_custom_libcxx=false \
 		use_gnome_keyring=false \
 		use_gtk3=true \
 		use_lld=true \
 		use_sysroot=false \
 		use_system_freetype=true \
 		use_system_harfbuzz=true \
 		use_system_libjpeg=true \
 		extra_cxxflags="-I${LOCALBASE}/include" \
 		extra_ldflags="-L${LOCALBASE}/lib"
 # TODO: investigate building with these options:
 # use_system_minigbm
 GN_BOOTSTRAP_FLAGS=	--no-clean --no-rebuild
 
 # FreeBSD Chromium Api Key
 # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
 # Note: these are for FreeBSD use ONLY. For your own distribution,
 # please get your own set of keys.
 GN_ARGS+=	google_api_key="AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8" \
 		google_default_client_id="996322985003.apps.googleusercontent.com" \
 		google_default_client_secret="IR1za9-1VK0zZ0f_O8MVFicn"
 
 .if !defined(GN_ONLY)
 SUB_FILES=	chromium-browser.desktop chrome pkg-message
-SUB_LIST+=	COMMENT="${COMMENT}" DATADIR="${DATADIR}"
+SUB_LIST+=	COMMENT="${COMMENT}"
 
 OPTIONS_DEFINE=	CODECS CUPS DEBUG DRIVER KERBEROS TEST
 CODECS_DESC=	Compile and enable patented codecs like H.264
 DRIVER_DESC=	Install chromedriver
 OPTIONS_GROUP=		AUDIO
 OPTIONS_GROUP_AUDIO=	ALSA PULSEAUDIO SNDIO
 
 OPTIONS_DEFAULT=	ALSA CODECS CUPS DRIVER KERBEROS
 OPTIONS_SUB=		yes
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \
 			alsa-lib>=1.1.1_1:audio/alsa-lib
 ALSA_VARS=		GN_ARGS+=use_alsa=true
 ALSA_VARS_OFF=		GN_ARGS+=use_alsa=false
 
 CODECS_VARS=		GN_ARGS+=ffmpeg_branding="Chrome" \
 			GN_ARGS+=proprietary_codecs=true \
 			GN_ARGS+=enable_hevc_demuxing=true
 CODECS_VARS_OFF=	GN_ARGS+=ffmpeg_branding="Chromium" \
 			GN_ARGS+=proprietary_codecs=false \
 			GN_ARGS+=enable_hevc_demuxing=false
 
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_VARS=		GN_ARGS+=use_cups=true
 CUPS_VARS_OFF=		GN_ARGS+=use_cups=false
 
 DEBUG_VARS=		BUILDTYPE=Debug \
 			GN_ARGS+=is_debug=true \
 			GN_ARGS+=is_component_build=false \
 			GN_BOOTSTRAP_FLAGS+=--debug \
-			WANTSPACE="lots of free disk space (~ 12GB)"
+			WANTSPACE="lots of free disk space (~ 13GB)"
 DEBUG_VARS_OFF=		BUILDTYPE=Release \
 			GN_ARGS+=is_debug=false \
 			GN_ARGS+=is_official_build=true \
 			GN_ARGS+=symbol_level=0 \
 			GN_ARGS+=remove_webcore_debug_symbols=true \
-			WANTSPACE="a fair amount of free disk space (~ 5.8GB)"
+			WANTSPACE="a fair amount of free disk space (~ 6.5GB)"
 
 DRIVER_BUILD_DEPENDS=	git:devel/git
 DRIVER_MAKE_ARGS=	chromedriver
 
 KERBEROS_VARS=		GN_ARGS+=use_kerberos=true
 KERBEROS_VARS_OFF=	GN_ARGS+=use_kerberos=false
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_VARS=	GN_ARGS+=use_pulseaudio=true
 PULSEAUDIO_VARS_OFF=	GN_ARGS+=use_pulseaudio=false
 
 # With SNDIO=on we exclude audio_manager_linux from the build (see
 # media/audio/BUILD.gn) and use audio_manager_openbsd which does not
 # support falling back to ALSA or PulseAudio.
 SNDIO_PREVENTS=		ALSA PULSEAUDIO
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_VARS=		GN_ARGS+=use_sndio=true
 SNDIO_VARS_OFF=		GN_ARGS+=use_sndio=false
 
 .endif
 
 .include "Makefile.tests"
 TEST_ALL_TARGET=	${TEST_TARGETS}
 TEST_DISTFILES=		${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1101513
 BUILD_DEPENDS+=	clang60:devel/llvm60
 CC=             clang60
 CXX=            clang++60
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-llvm-port
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/bin/ar:devel/binutils
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-llvm-base
 .endif
 
 # TODO: -isystem, would be just as ugly as this approach, but more reliably
 # build would fail without C_INCLUDE_PATH/CPLUS_INCLUDE_PATH env var set.
 MAKE_ENV+=	C_INCLUDE_PATH=${LOCALBASE}/include \
 		CPLUS_INCLUDE_PATH=${LOCALBASE}/include
 
 .if !defined(GN_ONLY)
 pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "To build Chromium, you should have around 2GB of memory"
 	@${ECHO_MSG} "and ${WANTSPACE}."
 	@${ECHO_MSG}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|@@PACKAGE@@|chromium|' \
 			-e 's|@@MENUNAME@@|Chromium Web Browser|' \
 			${WRKSRC}/chrome/app/resources/manpage.1.in
 
 post-patch-SNDIO-on:
 	@${MKDIR} ${WRKSRC}/media/audio/sndio ${WRKSRC}/media/audio/openbsd
 	@${CP} ${FILESDIR}/sndio_output.* ${WRKSRC}/media/audio/sndio
 	@${CP} ${FILESDIR}/sndio_input.* ${WRKSRC}/media/audio/sndio
 	@${CP} ${FILESDIR}/audio_manager_openbsd.* ${WRKSRC}/media/audio/openbsd
 
 pre-configure:
 	# We used to remove bundled libraries to be sure that chromium uses
 	# system libraries and not shipped ones.
 	# cd ${WRKSRC} && ${PYTHON_CMD} \
 	#./build/linux/unbundle/remove_bundled_libraries.py [list of preserved]
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
 		./build/linux/unbundle/replace_gn_files.py --system-libraries \
 		ffmpeg flac freetype harfbuzz-ng libdrm libusb libwebp libxml libxslt openh264 opus snappy yasm || ${FALSE}
 .endif
 
 do-configure:
 	# GN generator bootstrapping and generating ninja files
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} CC=${CC} CXX=${CXX} LD=${CXX} \
 		READELF=${READELF} AR=${AR} NM=${NM} ${PYTHON_CMD} \
 		./tools/gn/bootstrap/bootstrap.py ${GN_BOOTSTRAP_FLAGS}
 .if !defined(GN_ONLY)
 	cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./out/${BUILDTYPE}/gn \
 		gen --args='${GN_ARGS}' out/${BUILDTYPE}
 
 	# Setup nodejs dependency
 	@${MKDIR} ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin
 	${LN} -sf ${LOCALBASE}/bin/node ${WRKSRC}/third_party/node/freebsd/node-freebsd-x64/bin/node
 .endif
 
 do-test-TEST-on:
 .for t in ${TEST_TARGETS}
 	cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \
 		./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE}
 .endfor
 
 .if !defined(GN_ONLY)
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_MAN} ${WRKSRC}/chrome/app/resources/manpage.1.in \
 		${STAGEDIR}${MANPREFIX}/man/man1/chrome.1
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.service ${STAGEDIR}${DATADIR}
 .for s in 22 24 48 64 128 256
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps
 	${INSTALL_DATA} ${WRKSRC}/chrome/app/theme/chromium/product_logo_${s}.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/chrome.png
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.png ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/*.pak ${STAGEDIR}${DATADIR}
 .for d in protoc icudtl.dat mksnapshot natives_blob.bin snapshot_blob.bin v8_context_snapshot.bin
 	${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR}
 .endfor
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \
 		${STAGEDIR}${DATADIR}
 	cd ${WRKSRC}/out/${BUILDTYPE} && \
 		${COPYTREE_SHARE} "locales resources" ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKDIR}/chromium-browser.desktop \
 		${STAGEDIR}${DESKTOPDIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/chrome ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/chrome/tools/build/linux/chrome-wrapper \
 		${STAGEDIR}${DATADIR}
 .for f in libEGL.so libGLESv2.so
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/${f} ${STAGEDIR}${DATADIR}
 .endfor
 	@${MKDIR} ${STAGEDIR}${DATADIR}/swiftshader
 .for g in libEGL.so libGLESv2.so
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/swiftshader/${g} \
 		${STAGEDIR}${DATADIR}/swiftshader
 .endfor
-	${INSTALL_SCRIPT} ${FILESDIR}/fix-hanging-tabs.sh ${STAGEDIR}${DATADIR}
 
 post-install-DEBUG-on:
 	${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/*.so \
 		${STAGEDIR}${DATADIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/character_data_generator \
 		${STAGEDIR}${DATADIR}
 
 post-install-DRIVER-on:
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver \
 		${STAGEDIR}${PREFIX}/bin
 .endif
 .include <bsd.port.mk>
Index: branches/2018Q3/www/chromium/distinfo
===================================================================
--- branches/2018Q3/www/chromium/distinfo	(revision 477308)
+++ branches/2018Q3/www/chromium/distinfo	(revision 477309)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1533378824
-SHA256 (chromium-68.0.3440.84.tar.xz) = 1031d167ae18d8a37f9291ff0e9a3dca2337c0fc1031f2c243d0327b14ecc9d9
-SIZE (chromium-68.0.3440.84.tar.xz) = 630259488
-SHA256 (chromium-68.0.3440.84-testdata.tar.xz) = bdd6906154d7c4a8477da2e8fd25b08eebe472104256e62ec2ab63050218ddd3
-SIZE (chromium-68.0.3440.84-testdata.tar.xz) = 310285796
+TIMESTAMP = 1533765819
+SHA256 (chromium-68.0.3440.106.tar.xz) = 7021040635a0a0d47f699bdb22e3ef5c91482e4f51b428d1de3016da95f0e698
+SIZE (chromium-68.0.3440.106.tar.xz) = 630289544
+SHA256 (chromium-68.0.3440.106-testdata.tar.xz) = 2a736b339f7cbf9fd26901666f17f53b51f7191ed2f64ea65fb8afe638a1633b
+SIZE (chromium-68.0.3440.106-testdata.tar.xz) = 310263984
Index: branches/2018Q3/www/chromium/files/fix-hanging-tabs.sh
===================================================================
--- branches/2018Q3/www/chromium/files/fix-hanging-tabs.sh	(revision 477308)
+++ branches/2018Q3/www/chromium/files/fix-hanging-tabs.sh	(nonexistent)
@@ -1,45 +0,0 @@
-#! /bin/sh -
-#
-# Chromium has a known problem of hanging tabs.  The workaround for this
-# problem is to mount ~/.cache/chromium as memory-fs.  In order to do this,
-# before you run Chromium, please run this script as root once for each user
-# who uses Chromium.
-#
-# $FreeBSD$
-
-set -e
-
-# Make sure that the user specified both the user and the group.
-if [ ${#} -ne 2 ]; then
-	printf 'Usage: %s user group\n' "${0}" >&2
-	exit 1
-fi
-
-user="${1}"
-group="${2}"
-home="$(awk -F: -v user="${user}" '{if ($1==user) print $6}' /etc/passwd)"
-cachedir="${home}/.cache/chromium"
-fstabrecord="md ${cachedir} mfs rw,late,-w${user}:${group},-s300m 2 0"
-
-# Make sure that the provided user and group are valid.
-if ! id "${user}" >/dev/null 2>&1; then
-	printf 'Invalid user "%s"\n' "${user}" >&2
-	exit 1
-elif [ ! -d "${home}" ]; then
-	printf 'Cannot locate home directory of user "%s"\n' "${user}" >&2
-	exit 1
-elif ! grep "^${group}:" /etc/group >/dev/null; then
-	printf 'Invalid group "%s"\n' "${group}" >&2
-	exit 1
-fi
-
-if grep "${fstabrecord}" /etc/fstab >/dev/null; then
-	printf 'Workaround already configured for user "%s"\n' "${user}" >&2
-	exit 1
-fi
-
-if [ ! -d "${cachedir}" ]; then
-	su -l "${user}" -c 'mkdir "${cachedir}"'
-fi
-printf '%s\n' "${fstabrecord}" >> /etc/fstab
-mount "${cachedir}"

Property changes on: branches/2018Q3/www/chromium/files/fix-hanging-tabs.sh
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: branches/2018Q3/www/chromium/files/patch-build_linux_unbundle_libwebp.gn
===================================================================
--- branches/2018Q3/www/chromium/files/patch-build_linux_unbundle_libwebp.gn	(nonexistent)
+++ branches/2018Q3/www/chromium/files/patch-build_linux_unbundle_libwebp.gn	(revision 477309)
@@ -0,0 +1,41 @@
+--- build/linux/unbundle/libwebp.gn.orig	2018-08-13 22:43:49.456935000 +0200
++++ build/linux/unbundle/libwebp.gn	2018-08-13 22:48:47.151901000 +0200
+@@ -2,12 +2,34 @@
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+ 
++import("//build/config/linux/pkg_config.gni")
++import("//build/shim_headers.gni")
++
++pkg_config("system_libwebp") {
++  packages = [
++    "libwebp",
++    "libwebpdemux",
++    "libwebpmux",
++  ]
++}
++
++shim_headers("libwebp_shim") {
++  root_path = "src"
++  headers = [
++    "webp/decode.h",
++    "webp/demux.h",
++    "webp/encode.h",
++    "webp/mux.h",
++    "webp/mux_types.h",
++    "webp/types.h",
++  ]
++}
++
+ source_set("libwebp_webp") {
+-  libs = [
+-    "webp",
+-    "webpdemux",
+-    "webpmux",
++  deps = [
++    ":libwebp_shim",
+   ]
++  public_configs = [ ":system_libwebp" ]
+ }
+ 
+ group("libwebp") {

Property changes on: branches/2018Q3/www/chromium/files/patch-build_linux_unbundle_libwebp.gn
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2018Q3/www/chromium/files/patch-gpu_config_gpu__info__collector__freebsd.cc
===================================================================
--- branches/2018Q3/www/chromium/files/patch-gpu_config_gpu__info__collector__freebsd.cc	(revision 477308)
+++ branches/2018Q3/www/chromium/files/patch-gpu_config_gpu__info__collector__freebsd.cc	(revision 477309)
@@ -1,23 +1,32 @@
---- gpu/config/gpu_info_collector_freebsd.cc.orig	2018-07-20 13:47:10.021258000 +0200
-+++ gpu/config/gpu_info_collector_freebsd.cc	2018-07-20 15:44:42.380444000 +0200
-@@ -0,0 +1,20 @@
+--- gpu/config/gpu_info_collector_freebsd.cc.orig	2018-08-13 21:50:38.978048000 +0200
++++ gpu/config/gpu_info_collector_freebsd.cc	2018-08-13 21:54:59.868827000 +0200
+@@ -0,0 +1,29 @@
 +// Copyright 2017 The Chromium Authors. All rights reserved.
 +// Use of this source code is governed by a BSD-style license that can be
 +// found in the LICENSE file.
 +
++#include "base/trace_event/trace_event.h"
 +#include "gpu/config/gpu_info_collector.h"
++#include "third_party/angle/src/gpu_info_util/SystemInfo.h"
 +
 +namespace gpu {
 +
 +bool CollectContextGraphicsInfo(GPUInfo* gpu_info) {
-+  NOTIMPLEMENTED();
-+  return false;
++  DCHECK(gpu_info);
++
++  TRACE_EVENT0("gpu", "gpu_info_collector::CollectGraphicsInfo");
++
++  return CollectGraphicsInfoGL(gpu_info);
 +}
 +
 +bool CollectBasicGraphicsInfo(GPUInfo* gpu_info) {
-+  NOTIMPLEMENTED();
-+  return false;
++  DCHECK(gpu_info);
++
++  angle::SystemInfo system_info;
++  bool success = angle::GetSystemInfo(&system_info);
++  FillGPUInfoFromSystemInfo(gpu_info, &system_info);
++  return success;
 +}
 +
 +
 +}  // namespace gpu
Index: branches/2018Q3/www/chromium/files/patch-services_network_public_cpp_cors_cors_legacy.cc
===================================================================
--- branches/2018Q3/www/chromium/files/patch-services_network_public_cpp_cors_cors_legacy.cc	(nonexistent)
+++ branches/2018Q3/www/chromium/files/patch-services_network_public_cpp_cors_cors_legacy.cc	(revision 477309)
@@ -0,0 +1,11 @@
+--- services/network/public/cpp/cors/cors_legacy.cc.orig	2018-08-15 14:32:14.128925000 +0200
++++ services/network/public/cpp/cors/cors_legacy.cc	2018-08-15 14:32:27.135579000 +0200
+@@ -5,8 +5,6 @@
+ #include "services/network/public/cpp/cors/cors_legacy.h"
+ 
+ #include <algorithm>
+-#include <string>
+-#include <vector>
+ 
+ #include "url/gurl.h"
+ #include "url/url_util.h"

Property changes on: branches/2018Q3/www/chromium/files/patch-services_network_public_cpp_cors_cors_legacy.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2018Q3/www/chromium/files/patch-services_network_public_cpp_cors_cors_legacy.h
===================================================================
--- branches/2018Q3/www/chromium/files/patch-services_network_public_cpp_cors_cors_legacy.h	(nonexistent)
+++ branches/2018Q3/www/chromium/files/patch-services_network_public_cpp_cors_cors_legacy.h	(revision 477309)
@@ -0,0 +1,10 @@
+--- services/network/public/cpp/cors/cors_legacy.h.orig	2018-08-15 14:32:05.126217000 +0200
++++ services/network/public/cpp/cors/cors_legacy.h	2018-08-15 14:32:40.328286000 +0200
+@@ -5,6 +5,7 @@
+ #ifndef SERVICES_NETWORK_PUBLIC_CPP_CORS_CORS_LEGACY_H_
+ #define SERVICES_NETWORK_PUBLIC_CPP_CORS_CORS_LEGACY_H_
+ 
++#include <string>
+ #include <vector>
+ 
+ #include "base/component_export.h"

Property changes on: branches/2018Q3/www/chromium/files/patch-services_network_public_cpp_cors_cors_legacy.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_platform_image-decoders_jpeg_jpeg_image_decoder.cc
===================================================================
--- branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_platform_image-decoders_jpeg_jpeg_image_decoder.cc	(nonexistent)
+++ branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_platform_image-decoders_jpeg_jpeg_image_decoder.cc	(revision 477309)
@@ -0,0 +1,12 @@
+--- third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc.orig	2018-08-13 22:34:03.760055000 +0200
++++ third_party/blink/renderer/platform/image-decoders/jpeg/jpeg_image_decoder.cc	2018-08-13 22:41:48.671075000 +0200
+@@ -643,6 +643,9 @@
+   IntSize UvSize() const { return uv_size_; }
+ 
+  private:
++#if defined(USE_SYSTEM_LIBJPEG)
++  NO_SANITIZE_CFI_ICALL
++#endif
+   JSAMPARRAY AllocateSampleArray() {
+ // Some output color spaces don't need the sample array: don't allocate in that
+ // case.

Property changes on: branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_platform_image-decoders_jpeg_jpeg_image_decoder.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_platform_image-encoders_image_encoder.cc
===================================================================
--- branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_platform_image-encoders_image_encoder.cc	(nonexistent)
+++ branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_platform_image-encoders_image_encoder.cc	(revision 477309)
@@ -0,0 +1,20 @@
+--- third_party/blink/renderer/platform/image-encoders/image_encoder.cc.orig	2018-08-13 22:25:20.364425000 +0200
++++ third_party/blink/renderer/platform/image-encoders/image_encoder.cc	2018-08-13 22:28:52.206462000 +0200
+@@ -4,6 +4,17 @@
+ 
+ #include "third_party/blink/renderer/platform/image-encoders/image_encoder.h"
+ 
++#include "build/build_config.h"
++
++#if defined(OS_WIN)
++#include <basetsd.h>  // Included before jpeglib.h because of INT32 clash
++#endif                // OS_WIN
++#include <stdio.h>    // Needed by jpeglib.h
++
++#include "jpeglib.h"  // for JPEG_MAX_DIMENSION
++
++#include "third_party/libwebp/src/webp/encode.h"  // for WEBP_MAX_DIMENSION
++
+ namespace blink {
+ 
+ bool ImageEncoder::Encode(Vector<unsigned char>* dst,

Property changes on: branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_platform_image-encoders_image_encoder.cc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_platform_image-encoders_image_encoder.h
===================================================================
--- branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_platform_image-encoders_image_encoder.h	(nonexistent)
+++ branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_platform_image-encoders_image_encoder.h	(revision 477309)
@@ -0,0 +1,11 @@
+--- third_party/blink/renderer/platform/image-encoders/image_encoder.h.orig	2018-08-13 22:29:12.687720000 +0200
++++ third_party/blink/renderer/platform/image-encoders/image_encoder.h	2018-08-13 22:29:25.094079000 +0200
+@@ -7,8 +7,6 @@
+ 
+ #include "third_party/blink/renderer/platform/platform_export.h"
+ #include "third_party/blink/renderer/platform/wtf/vector.h"
+-#include "third_party/libjpeg/jpeglib.h"          // for JPEG_MAX_DIMENSION
+-#include "third_party/libwebp/src/webp/encode.h"  // for WEBP_MAX_DIMENSION
+ #include "third_party/skia/include/core/SkStream.h"
+ #include "third_party/skia/include/encode/SkJpegEncoder.h"
+ #include "third_party/skia/include/encode/SkPngEncoder.h"

Property changes on: branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_platform_image-encoders_image_encoder.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_compiler.h
===================================================================
--- branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_compiler.h	(nonexistent)
+++ branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_compiler.h	(revision 477309)
@@ -0,0 +1,13 @@
+--- third_party/blink/renderer/platform/wtf/compiler.h.orig	2018-08-13 22:36:40.462317000 +0200
++++ third_party/blink/renderer/platform/wtf/compiler.h	2018-08-13 22:38:32.823279000 +0200
+@@ -74,8 +74,10 @@
+ #if defined(__clang__)
+ #define NO_SANITIZE_UNRELATED_CAST \
+   __attribute__((no_sanitize("cfi-unrelated-cast", "vptr")))
++#define NO_SANITIZE_CFI_ICALL __attribute__((no_sanitize("cfi-icall")))
+ #else
+ #define NO_SANITIZE_UNRELATED_CAST
++#define NO_SANITIZE_CFI_ICALL
+ #endif
+ 
+ #endif /* WTF_Compiler_h */

Property changes on: branches/2018Q3/www/chromium/files/patch-third_party_blink_renderer_platform_wtf_compiler.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2018Q3/www/chromium/files/pkg-message.in
===================================================================
--- branches/2018Q3/www/chromium/files/pkg-message.in	(revision 477308)
+++ branches/2018Q3/www/chromium/files/pkg-message.in	(revision 477309)
@@ -1,21 +1,21 @@
 --I--
 For correct operation, shared memory support has to be enabled
 in Chromium by performing the following command as root:
 
     # sysctl kern.ipc.shm_allow_removed=1
 
 To preserve this setting across reboots, append the following
 to /etc/sysctl.conf:
 
     kern.ipc.shm_allow_removed=1
 
 FreeBSD 11.0-RELEASE and newer have this set by default.
 
 --II--
-Chromium has a known problem of hanging tabs. The workaround
-for this problem is to mount ~/.cache/chromium as memory-fs.
-In order to do this, before you run Chromium, please run the
-following script as root once for each user who uses Chromium
-(replace {user}/{group} with your user/group names):
+Chromium has a known problem of hanging tabs. The bug has been fixed
+in r337328. Therefore, it is recommended to upgrade the system after
+the correction date.
 
-    # %%DATADIR%%/fix-hanging-tabs.sh {user} {group}
+    # svn diff -c337328 --summarize svn://svn.freebsd.org/base
+
+See PR 212812 for further details.
Index: branches/2018Q3/www/chromium/pkg-plist
===================================================================
--- branches/2018Q3/www/chromium/pkg-plist	(revision 477308)
+++ branches/2018Q3/www/chromium/pkg-plist	(revision 477309)
@@ -1,335 +1,334 @@
 bin/chrome
 %%DATADIR%%/chrome
 %%DATADIR%%/chrome-wrapper
 %%DATADIR%%/chrome_100_percent.pak
 %%DATADIR%%/chrome_200_percent.pak
-%%DATADIR%%/fix-hanging-tabs.sh
 %%DATADIR%%/font_service.service
 %%DATADIR%%/headless_lib.pak
 %%DATADIR%%/icudtl.dat
 %%DATADIR%%/natives_blob.bin
 %%DATADIR%%/keyboard_resources.pak
 %%DATADIR%%/libEGL.so
 %%DATADIR%%/libGLESv2.so
 %%DATADIR%%/locales/am.pak
 %%DATADIR%%/locales/am.pak.info
 %%DATADIR%%/locales/ar.pak
 %%DATADIR%%/locales/ar.pak.info
 %%DATADIR%%/locales/bg.pak
 %%DATADIR%%/locales/bg.pak.info
 %%DATADIR%%/locales/bn.pak
 %%DATADIR%%/locales/bn.pak.info
 %%DATADIR%%/locales/ca.pak
 %%DATADIR%%/locales/ca.pak.info
 %%DATADIR%%/locales/cs.pak
 %%DATADIR%%/locales/cs.pak.info
 %%DATADIR%%/locales/da.pak
 %%DATADIR%%/locales/da.pak.info
 %%DATADIR%%/locales/de.pak
 %%DATADIR%%/locales/de.pak.info
 %%DATADIR%%/locales/el.pak
 %%DATADIR%%/locales/el.pak.info
 %%DATADIR%%/locales/en-GB.pak
 %%DATADIR%%/locales/en-GB.pak.info
 %%DATADIR%%/locales/en-US.pak
 %%DATADIR%%/locales/en-US.pak.info
 %%DATADIR%%/locales/es-419.pak
 %%DATADIR%%/locales/es-419.pak.info
 %%DATADIR%%/locales/es.pak
 %%DATADIR%%/locales/es.pak.info
 %%DATADIR%%/locales/et.pak
 %%DATADIR%%/locales/et.pak.info
 %%DATADIR%%/locales/fa.pak
 %%DATADIR%%/locales/fa.pak.info
 %%DATADIR%%/locales/fi.pak
 %%DATADIR%%/locales/fi.pak.info
 %%DATADIR%%/locales/fil.pak
 %%DATADIR%%/locales/fil.pak.info
 %%DATADIR%%/locales/fr.pak
 %%DATADIR%%/locales/fr.pak.info
 %%DATADIR%%/locales/gu.pak
 %%DATADIR%%/locales/gu.pak.info
 %%DATADIR%%/locales/he.pak
 %%DATADIR%%/locales/he.pak.info
 %%DATADIR%%/locales/hi.pak
 %%DATADIR%%/locales/hi.pak.info
 %%DATADIR%%/locales/hr.pak
 %%DATADIR%%/locales/hr.pak.info
 %%DATADIR%%/locales/hu.pak
 %%DATADIR%%/locales/hu.pak.info
 %%DATADIR%%/locales/id.pak
 %%DATADIR%%/locales/id.pak.info
 %%DATADIR%%/locales/it.pak
 %%DATADIR%%/locales/it.pak.info
 %%DATADIR%%/locales/ja.pak
 %%DATADIR%%/locales/ja.pak.info
 %%DATADIR%%/locales/kn.pak
 %%DATADIR%%/locales/kn.pak.info
 %%DATADIR%%/locales/ko.pak
 %%DATADIR%%/locales/ko.pak.info
 %%DATADIR%%/locales/lt.pak
 %%DATADIR%%/locales/lt.pak.info
 %%DATADIR%%/locales/lv.pak
 %%DATADIR%%/locales/lv.pak.info
 %%DATADIR%%/locales/ml.pak
 %%DATADIR%%/locales/ml.pak.info
 %%DATADIR%%/locales/mr.pak
 %%DATADIR%%/locales/mr.pak.info
 %%DATADIR%%/locales/ms.pak
 %%DATADIR%%/locales/ms.pak.info
 %%DATADIR%%/locales/nb.pak
 %%DATADIR%%/locales/nb.pak.info
 %%DATADIR%%/locales/nl.pak
 %%DATADIR%%/locales/nl.pak.info
 %%DATADIR%%/locales/pl.pak
 %%DATADIR%%/locales/pl.pak.info
 %%DATADIR%%/locales/pt-BR.pak
 %%DATADIR%%/locales/pt-BR.pak.info
 %%DATADIR%%/locales/pt-PT.pak
 %%DATADIR%%/locales/pt-PT.pak.info
 %%DATADIR%%/locales/ro.pak
 %%DATADIR%%/locales/ro.pak.info
 %%DATADIR%%/locales/ru.pak
 %%DATADIR%%/locales/ru.pak.info
 %%DATADIR%%/locales/sk.pak
 %%DATADIR%%/locales/sk.pak.info
 %%DATADIR%%/locales/sl.pak
 %%DATADIR%%/locales/sl.pak.info
 %%DATADIR%%/locales/sr.pak
 %%DATADIR%%/locales/sr.pak.info
 %%DATADIR%%/locales/sv.pak
 %%DATADIR%%/locales/sv.pak.info
 %%DATADIR%%/locales/sw.pak
 %%DATADIR%%/locales/sw.pak.info
 %%DATADIR%%/locales/ta.pak
 %%DATADIR%%/locales/ta.pak.info
 %%DATADIR%%/locales/te.pak
 %%DATADIR%%/locales/te.pak.info
 %%DATADIR%%/locales/th.pak
 %%DATADIR%%/locales/th.pak.info
 %%DATADIR%%/locales/tr.pak
 %%DATADIR%%/locales/tr.pak.info
 %%DATADIR%%/locales/uk.pak
 %%DATADIR%%/locales/uk.pak.info
 %%DATADIR%%/locales/vi.pak
 %%DATADIR%%/locales/vi.pak.info
 %%DATADIR%%/locales/zh-CN.pak
 %%DATADIR%%/locales/zh-CN.pak.info
 %%DATADIR%%/locales/zh-TW.pak
 %%DATADIR%%/locales/zh-TW.pak.info
 %%DATADIR%%/mksnapshot
 %%DATADIR%%/product_logo_48.png
 %%DATADIR%%/protoc
 %%DATADIR%%/resources.pak
 %%DATADIR%%/resources/inspector/Images/accelerometer-back.png
 %%DATADIR%%/resources/inspector/Images/accelerometer-bottom.png
 %%DATADIR%%/resources/inspector/Images/accelerometer-front.png
 %%DATADIR%%/resources/inspector/Images/accelerometer-left.png
 %%DATADIR%%/resources/inspector/Images/accelerometer-right.png
 %%DATADIR%%/resources/inspector/Images/accelerometer-top.png
 %%DATADIR%%/resources/inspector/Images/audits_logo.svg
 %%DATADIR%%/resources/inspector/Images/breakpoint.png
 %%DATADIR%%/resources/inspector/Images/breakpointConditional.png
 %%DATADIR%%/resources/inspector/Images/breakpointConditional_2x.png
 %%DATADIR%%/resources/inspector/Images/breakpoint_2x.png
 %%DATADIR%%/resources/inspector/Images/checker.png
 %%DATADIR%%/resources/inspector/Images/chromeDisabledSelect.png
 %%DATADIR%%/resources/inspector/Images/chromeDisabledSelect_2x.png
 %%DATADIR%%/resources/inspector/Images/chromeLeft.png
 %%DATADIR%%/resources/inspector/Images/chromeMiddle.png
 %%DATADIR%%/resources/inspector/Images/chromeRight.png
 %%DATADIR%%/resources/inspector/Images/chromeSelect.png
 %%DATADIR%%/resources/inspector/Images/chromeSelect_2x.png
 %%DATADIR%%/resources/inspector/Images/deleteIcon.png
 %%DATADIR%%/resources/inspector/Images/errorWave.png
 %%DATADIR%%/resources/inspector/Images/errorWave_2x.png
 %%DATADIR%%/resources/inspector/Images/ic_info_black_18dp.svg
 %%DATADIR%%/resources/inspector/Images/ic_warning_black_18dp.svg
 %%DATADIR%%/resources/inspector/Images/largeIcons.png
 %%DATADIR%%/resources/inspector/Images/largeIcons_2x.png
 %%DATADIR%%/resources/inspector/Images/mediumIcons.png
 %%DATADIR%%/resources/inspector/Images/mediumIcons_2x.png
 %%DATADIR%%/resources/inspector/Images/navigationControls.png
 %%DATADIR%%/resources/inspector/Images/navigationControls_2x.png
 %%DATADIR%%/resources/inspector/Images/nodeIcon.png
 %%DATADIR%%/resources/inspector/Images/popoverArrows.png
 %%DATADIR%%/resources/inspector/Images/profileGroupIcon.png
 %%DATADIR%%/resources/inspector/Images/profileIcon.png
 %%DATADIR%%/resources/inspector/Images/profileSmallIcon.png
 %%DATADIR%%/resources/inspector/Images/radioDot.png
 %%DATADIR%%/resources/inspector/Images/resizeDiagonal.png
 %%DATADIR%%/resources/inspector/Images/resizeDiagonal_2x.png
 %%DATADIR%%/resources/inspector/Images/resizeHorizontal.png
 %%DATADIR%%/resources/inspector/Images/resizeHorizontal_2x.png
 %%DATADIR%%/resources/inspector/Images/resizeVertical.png
 %%DATADIR%%/resources/inspector/Images/resizeVertical_2x.png
 %%DATADIR%%/resources/inspector/Images/resourceCSSIcon.png
 %%DATADIR%%/resources/inspector/Images/resourceDocumentIcon.png
 %%DATADIR%%/resources/inspector/Images/resourceDocumentIconSmall.png
 %%DATADIR%%/resources/inspector/Images/resourceJSIcon.png
 %%DATADIR%%/resources/inspector/Images/resourcePlainIcon.png
 %%DATADIR%%/resources/inspector/Images/resourcePlainIconSmall.png
 %%DATADIR%%/resources/inspector/Images/resourcesTimeGraphIcon.png
 %%DATADIR%%/resources/inspector/Images/searchNext.png
 %%DATADIR%%/resources/inspector/Images/searchPrev.png
 %%DATADIR%%/resources/inspector/Images/securityIcons.png
 %%DATADIR%%/resources/inspector/Images/securityIcons_2x.png
 %%DATADIR%%/resources/inspector/Images/smallIcons.png
 %%DATADIR%%/resources/inspector/Images/smallIcons_2x.png
 %%DATADIR%%/resources/inspector/Images/speech.png
 %%DATADIR%%/resources/inspector/Images/toolbarResizerVertical.png
 %%DATADIR%%/resources/inspector/Images/touchCursor.png
 %%DATADIR%%/resources/inspector/Images/touchCursor_2x.png
 %%DATADIR%%/resources/inspector/Images/treeoutlineTriangles.png
 %%DATADIR%%/resources/inspector/Images/treeoutlineTriangles_2x.png
 %%DATADIR%%/resources/inspector/Images/whatsnew.png
 %%DATADIR%%/resources/inspector/InspectorBackendCommands.js
 %%DATADIR%%/resources/inspector/SupportedCSSProperties.js
 %%DATADIR%%/resources/inspector/Tests.js
 %%DATADIR%%/resources/inspector/accessibility/ARIAProperties.js
 %%DATADIR%%/resources/inspector/accessibility/accessibility_module.js
 %%DATADIR%%/resources/inspector/accessibility_test_runner/accessibility_test_runner_module.js
 %%DATADIR%%/resources/inspector/animation/animation_module.js
 %%DATADIR%%/resources/inspector/application_test_runner/application_test_runner_module.js
 %%DATADIR%%/resources/inspector/audits2/audits2_module.js
 %%DATADIR%%/resources/inspector/audits2_test_runner/audits2_test_runner_module.js
 %%DATADIR%%/resources/inspector/audits2_worker.js
 %%DATADIR%%/resources/inspector/audits2_worker/audits2_worker_module.js
 %%DATADIR%%/resources/inspector/bindings_test_runner/bindings_test_runner_module.js
 %%DATADIR%%/resources/inspector/browser_console/browser_console_module.js
 %%DATADIR%%/resources/inspector/browser_debugger/browser_debugger_module.js
 %%DATADIR%%/resources/inspector/changes/changes_module.js
 %%DATADIR%%/resources/inspector/cm/cm_module.js
 %%DATADIR%%/resources/inspector/cm_modes/cm_modes_module.js
 %%DATADIR%%/resources/inspector/color_picker/color_picker_module.js
 %%DATADIR%%/resources/inspector/console/console_module.js
 %%DATADIR%%/resources/inspector/console_test_runner/console_test_runner_module.js
 %%DATADIR%%/resources/inspector/cookie_table/cookie_table_module.js
 %%DATADIR%%/resources/inspector/coverage/coverage_module.js
 %%DATADIR%%/resources/inspector/coverage_test_runner/coverage_test_runner_module.js
 %%DATADIR%%/resources/inspector/cpu_profiler_test_runner/cpu_profiler_test_runner_module.js
 %%DATADIR%%/resources/inspector/data_grid/data_grid_module.js
 %%DATADIR%%/resources/inspector/data_grid_test_runner/data_grid_test_runner_module.js
 %%DATADIR%%/resources/inspector/device_mode_test_runner/device_mode_test_runner_module.js
 %%DATADIR%%/resources/inspector/devices/devices_module.js
 %%DATADIR%%/resources/inspector/devtools_app.html
 %%DATADIR%%/resources/inspector/devtools_app.js
 %%DATADIR%%/resources/inspector/devtools_compatibility.js
 %%DATADIR%%/resources/inspector/devtools_extension_api.js
 %%DATADIR%%/resources/inspector/diff/diff_module.js
 %%DATADIR%%/resources/inspector/elements/elements_module.js
 %%DATADIR%%/resources/inspector/elements_test_runner/elements_test_runner_module.js
 %%DATADIR%%/resources/inspector/emulated_devices/Nexus5X-landscape.svg
 %%DATADIR%%/resources/inspector/emulated_devices/Nexus5X-portrait.svg
 %%DATADIR%%/resources/inspector/emulated_devices/Nexus6P-landscape.svg
 %%DATADIR%%/resources/inspector/emulated_devices/Nexus6P-portrait.svg
 %%DATADIR%%/resources/inspector/emulated_devices/emulated_devices_module.js
 %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-default-1x.png
 %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-default-2x.png
 %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-keyboard-1x.png
 %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-keyboard-2x.png
 %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-navigation-1x.png
 %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-navigation-2x.png
 %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-vertical-default-1x.png
 %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-vertical-default-2x.png
 %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-vertical-keyboard-1x.png
 %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-vertical-keyboard-2x.png
 %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-vertical-navigation-1x.png
 %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-vertical-navigation-2x.png
 %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-horizontal-default-1x.png
 %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-horizontal-default-2x.png
 %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-horizontal-keyboard-1x.png
 %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-horizontal-keyboard-2x.png
 %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-horizontal-navigation-1x.png
 %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-horizontal-navigation-2x.png
 %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-vertical-default-1x.png
 %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-vertical-default-2x.png
 %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-vertical-keyboard-1x.png
 %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-vertical-keyboard-2x.png
 %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-vertical-navigation-1x.png
 %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-vertical-navigation-2x.png
 %%DATADIR%%/resources/inspector/emulated_devices/iPad-landscape.svg
 %%DATADIR%%/resources/inspector/emulated_devices/iPad-portrait.svg
 %%DATADIR%%/resources/inspector/emulated_devices/iPhone5-landscape.svg
 %%DATADIR%%/resources/inspector/emulated_devices/iPhone5-portrait.svg
 %%DATADIR%%/resources/inspector/emulated_devices/iPhone6-landscape.svg
 %%DATADIR%%/resources/inspector/emulated_devices/iPhone6-portrait.svg
 %%DATADIR%%/resources/inspector/emulated_devices/iPhone6Plus-landscape.svg
 %%DATADIR%%/resources/inspector/emulated_devices/iPhone6Plus-portrait.svg
 %%DATADIR%%/resources/inspector/event_listeners/event_listeners_module.js
 %%DATADIR%%/resources/inspector/extensions_test_runner/extensions_test_runner_module.js
 %%DATADIR%%/resources/inspector/formatter_worker.js
 %%DATADIR%%/resources/inspector/formatter/formatter_module.js
 %%DATADIR%%/resources/inspector/har_importer/har_importer_module.js
 %%DATADIR%%/resources/inspector/heap_profiler_test_runner/heap_profiler_test_runner_module.js
 %%DATADIR%%/resources/inspector/heap_snapshot_model/heap_snapshot_model_module.js
 %%DATADIR%%/resources/inspector/heap_snapshot_worker.js
 %%DATADIR%%/resources/inspector/heap_snapshot_worker/heap_snapshot_worker_module.js
 %%DATADIR%%/resources/inspector/help/help_module.js
 %%DATADIR%%/resources/inspector/inline_editor/inline_editor_module.js
 %%DATADIR%%/resources/inspector/inspector.html
 %%DATADIR%%/resources/inspector/inspector.js
 %%DATADIR%%/resources/inspector/integration_test_runner.html
 %%DATADIR%%/resources/inspector/integration_test_runner.js
 %%DATADIR%%/resources/inspector/javascript_metadata/javascript_metadata_module.js
 %%DATADIR%%/resources/inspector/js_app.html
 %%DATADIR%%/resources/inspector/js_app.js
 %%DATADIR%%/resources/inspector/js_profiler/js_profiler_module.js
 %%DATADIR%%/resources/inspector/layer_viewer/layer_viewer_module.js
 %%DATADIR%%/resources/inspector/layers/layers_module.js
 %%DATADIR%%/resources/inspector/layers_test_runner/layers_test_runner_module.js
 %%DATADIR%%/resources/inspector/ndb_app.html
 %%DATADIR%%/resources/inspector/ndb_app.js
 %%DATADIR%%/resources/inspector/network/network_module.js
 %%DATADIR%%/resources/inspector/network_test_runner/network_test_runner_module.js
 %%DATADIR%%/resources/inspector/node_app.html
 %%DATADIR%%/resources/inspector/node_app.js
 %%DATADIR%%/resources/inspector/node_debugger/node_debugger_module.js
 %%DATADIR%%/resources/inspector/object_ui/object_ui_module.js
 %%DATADIR%%/resources/inspector/perf_ui/perf_ui_module.js
 %%DATADIR%%/resources/inspector/performance_monitor/performance_monitor_module.js
 %%DATADIR%%/resources/inspector/performance_test_runner/performance_test_runner_module.js
 %%DATADIR%%/resources/inspector/product_registry_impl/product_registry_impl_module.js
 %%DATADIR%%/resources/inspector/profiler/profiler_module.js
 %%DATADIR%%/resources/inspector/protocol_monitor/protocol_monitor_module.js
 %%DATADIR%%/resources/inspector/quick_open/quick_open_module.js
 %%DATADIR%%/resources/inspector/resources/resources_module.js
 %%DATADIR%%/resources/inspector/sdk_test_runner/sdk_test_runner_module.js
 %%DATADIR%%/resources/inspector/search/search_module.js
 %%DATADIR%%/resources/inspector/security/security_module.js
 %%DATADIR%%/resources/inspector/security_test_runner/security_test_runner_module.js
 %%DATADIR%%/resources/inspector/settings/settings_module.js
 %%DATADIR%%/resources/inspector/shell.js
 %%DATADIR%%/resources/inspector/snippets/snippets_module.js
 %%DATADIR%%/resources/inspector/source_frame/source_frame_module.js
 %%DATADIR%%/resources/inspector/sources/sources_module.js
 %%DATADIR%%/resources/inspector/sources_test_runner/sources_test_runner_module.js
 %%DATADIR%%/resources/inspector/terminal/terminal_module.js
 %%DATADIR%%/resources/inspector/text_editor/text_editor_module.js
 %%DATADIR%%/resources/inspector/timeline/timeline_module.js
 %%DATADIR%%/resources/inspector/timeline_model/timeline_model_module.js
 %%DATADIR%%/resources/inspector/toolbox.html
 %%DATADIR%%/resources/inspector/toolbox.js
 %%DATADIR%%/resources/inspector/worker_app.html
 %%DATADIR%%/resources/inspector/worker_app.js
 %%DATADIR%%/resources/inspector/workspace_diff/workspace_diff_module.js
 %%DATADIR%%/snapshot_blob.bin
 %%DATADIR%%/swiftshader/libEGL.so
 %%DATADIR%%/swiftshader/libGLESv2.so
 %%DATADIR%%/v8_context_snapshot.bin
 %%DATADIR%%/views_mus_resources.pak
 %%DEBUG%%%%DATADIR%%/character_data_generator
 %%DEBUG%%%%DATADIR%%/libVkLayer_core_validation.so
 %%DEBUG%%%%DATADIR%%/libVkLayer_object_tracker.so
 %%DEBUG%%%%DATADIR%%/libVkLayer_parameter_validation.so
 %%DEBUG%%%%DATADIR%%/libVkLayer_threading.so
 %%DEBUG%%%%DATADIR%%/libVkLayer_unique_objects.so
 %%DRIVER%%bin/chromedriver
 man/man1/chrome.1.gz
 share/applications/chromium-browser.desktop
 share/icons/hicolor/128x128/apps/chrome.png
 share/icons/hicolor/22x22/apps/chrome.png
 share/icons/hicolor/24x24/apps/chrome.png
 share/icons/hicolor/256x256/apps/chrome.png
 share/icons/hicolor/48x48/apps/chrome.png
 share/icons/hicolor/64x64/apps/chrome.png
Index: branches/2018Q3
===================================================================
--- branches/2018Q3	(revision 477308)
+++ branches/2018Q3	(revision 477309)

Property changes on: branches/2018Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r477294