gentoo resync : 17.06.2021

5 files changed, 59 insertions, 21 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 44c6d1ca1c5c..8a0bd7c196a9 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -2,21 +2,22 @@ AUX chromium-89-EnumTable-crash.patch 2712 BLAKE2B 6715f98a5cd2c9886050f9d360938
 AUX chromium-91-ThemeService-crash.patch 1306 BLAKE2B 327fa2365ba15efa754d959afa8ce7a4f6a3134275b5ae2ba3018dee107c287477903f40337ebac9c1f95995c1a133c3b644bcfcb627466b5b9b8fda511542a6 SHA512 f729888b45b103a600babec88dfac9f1605e0a03cd2d5832b8790bf11eca1c36ef4fa0e16912b972e83d7c31b2c96fbb00445dcaa9711e2bc9cd4d3f8f244d0e
 AUX chromium-91-system-icu.patch 946 BLAKE2B 68cac9880e88c2d7048895b3ddcfb6c3615df6d0d7b59c81b1a25e223114cf792956408dbe8038a2db2076d9985170b3beca4de3bf0589016a24e7b23c2608d2 SHA512 89943ea95cdf5b1c92d494e9019935f683a03d8379ef208bb5b2ca746eb3eb0ccee6d91e24d831eb0092960b376a7cdda7c3e2043765b0577cf2154b00a43ac9
 AUX chromium-92-EnumTable-crash.patch 2712 BLAKE2B adf5bd0ca388395245ebe4b17d31fa75b636f036860888fa7036e3a57fe4064669f11da2623b15bba90879146f583668b3ca0af56f88c99d2f7f0b98601b012f SHA512 8cfc83fd02f505acc531dece5b06c4f32bee5c6d5a3fa467d7607adbf8705f78dfb7550c69ac10e788f3aa9acc5bb361b894ec36ddd043222f9ca6e07d8a23a4
+AUX chromium-93-InkDropHost-crash.patch 1134 BLAKE2B 1593c406c48b629ea3170a518cf86e936af36c554bc97a380324ab6fc930e49a359dc3ef6787ab08314a6a8f5da85714b0fa9d8589d6a46b1d06cbbd7e401f22 SHA512 474d7f55505e1275238d71d1723d74a66fc9f27a16ed293aa80ffefbe5500cd65a0bf13ec76a9bca0334a245f22120099fb367d12b93adc14500104d11cd3bff
 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca
 AUX chromium-glibc-2.33.patch 5771 BLAKE2B 792306c8b171ab4347bacbbfc7f0fb38c5c6e9d97f3d4cf17320e7091a9d9c2765e2204262daf8ed71b1d346b255fcb3d5c2c0161e7a854dab4db9749ef7dd32 SHA512 b8bc3cb40d187500e22455a08d5c9cd5638665f717f3cfcf81d913ffe1af8c9c37bcd81c0066024721dafd74f0df178e7fb4c1028c614902cd32a1da4db0ede1
 AUX chromium-launcher-r6.sh 1593 BLAKE2B a871bd572239552390b216c89269dfe132474e1f57bfd0429f605af8285634659725c550b701e537f56adf20cba2dcb27dd9dadd390366dedc147f1ee987f462 SHA512 c01cb376eae2871dfa7a488d96ac8cc3445230eeb0fbd865948c5b3b601820468e85f2f0b9b30fff940c736aded050b7802759b8562e6378747af93c1d4f08a3
 AUX chromium-shim_headers.patch 1510 BLAKE2B 9716cd250b249c6255aca01a385ef8a2a6f1df9ea3cf7499715543c14f8be62fd323b6048b890aa2be45891e7a765d92de3f41c3b3a88c08dae4b806c048e20f SHA512 c74bcf690a41b4f9b364477d23408d493aa674e3bd014940098a594471297c2a425241f908510061b5f11c9cfe009c4a803370edd757d3c0ab8d9c0cc128135c
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
 DIST chromium-91-patchset-6.tar.xz 4280 BLAKE2B 18887953453133589cfc5df58d24725047235fac3652cc7af7bd117fbc94aa9a2e1b1dd3147f772f84d8fa3e7b5b77159abc1e408d7b24b065bb1f12cebbfb2f SHA512 49b4aaedfbb1fa5629dbb453bb74f5735c05b14407ea3d2bb1eaee9686e03661a3c471357d085ab839dff16df92d71dae3a6f17486c017a79a836c1d8780a250
-DIST chromium-91-ppc64le-5.tar.xz 28988 BLAKE2B 7c574626546c9b8c67879277a9b06b95b51111fef7697b7edab5548b4372a73c56a5771dc3ab6126535477493d7415e3e9b3b446cb4faa7b095a56cafaaab2fb SHA512 637433ce28b9f1e41696d1027f1bb5858fc5bdef94121deb34a9eafd58c651af4b84c103f3319151c0b708ad8da1756eff14025979dc46797d20cc95afb3d3bc
-DIST chromium-91.0.4472.101.tar.xz 950228560 BLAKE2B 441ef6106c09e24ae5b0ebbcebc016bafe46a3064c1b8e44065c63850c1155fd3247357ea6371da6fe226032ac250dc8664ec7ea912916493c705fd0ff02fefe SHA512 d779888d4b6e16c2dcdc18d008d3a5ed755926e9ab2ad1586167c45200d4074b74ab19258c2f6d7515d705cd51815a7601feb0bfab133b4b40d062fd1697525a
+DIST chromium-91-ppc64le-6.tar.xz 28968 BLAKE2B 5153be672aec91899d9eabe3ddf4c3d0b4b2d307e396afa2a83bf3102bc540fa62d69df365057128227428bd3abfc8cab9203fae41e5150191025d8ecea935ab SHA512 78071d204bf04a13a132a63a3d268a0d6d05a895c1ee55a41176fb5cca975c502e69a83ca0388ecea92c041f24235c452abdfbf0ee557e93db6685589fb9428b
+DIST chromium-91.0.4472.106.tar.xz 950214296 BLAKE2B 1c68c3d6ccb593b4516482ba8f18f3bf769fe90ca423692f8e8d9fabd36fa8cda7a66f870fc30478ea4e1f9bd147bb6cadb77df4d9e0ef846c30e653b15dcc98 SHA512 142507bbf5fcc47d7eeb5f890ed70eae403271a7f537903545ad09ac26501aae914f327c3287d5588ed4ab601012584f6204cca6896ed2705326b090df2fe00c
 DIST chromium-92-patchset-6.tar.xz 3764 BLAKE2B a7149940b1371e4bd295e6038b87cc13f4edf8d8ed286d9d8d0e63144c2546de39564fc203a4b2e185267e46398efd0414c1f695ee31c78d33a6cd8d7b434016 SHA512 2f104901271d42762ea27f7c8a017307bde7348ec6b84d0c85875a07bf3783ba43bdb886fb3c6376753b6a14102b495a28bdc7adc611992440d2c1345aea035b
 DIST chromium-92.0.4515.51.tar.xz 957598564 BLAKE2B 5b911148153cae7058522d155b671c96f94a42621b9e0c371a82acb953de5bfa0baa1c6fe410a8e23d1ff77756437c39bab809cee1f95634ab1abb87ff5456b7 SHA512 63bb8012b7f0cec81bdb13e0acf1ef43e996cb3c66f2374933741c21fd906a6e0ce88e16b4772d4f14cb197c3e35f99235b56021780e405d245b5721096ae732
-DIST chromium-93-patchset-2.tar.xz 4844 BLAKE2B 34036f2529043329ef33f142c90929504445c8597fbee57f5614579672f88d71ee3c8eb4b0864051fbeaa30ff4a6958a2f71240b11a84d7ebb695b6b90bd21d2 SHA512 db25ef16f82947d2f9971648dbdd41b1c30e6323d85535c6fd6dbcae9d408606cd9c55a609140aa6baff072d2c71fa811bc2fe8fca465004b734690f8f875744
-DIST chromium-93.0.4535.3.tar.xz 966263580 BLAKE2B 88166ea8f11f41aa088859ecd193873d695ca04731d36d795a8d31f1b49884235203bebf93c80531003b5c6d6fcc73bb14715d3c8284240cb4400c8c05a09eb0 SHA512 b09eff9129ea9e1cdfa72747d30f624b223c07622536b085096652e48d7c1e72aea2de08bb77533ef4101a707474c8bf3cd861b43fa589a70b536f46b4b3af73
+DIST chromium-93-patchset-3.tar.xz 4848 BLAKE2B eb46541d283f8c17967ad45ac36838f9f46f20883eb13260c5804aaf805736283a7890e5f76ab7c1dccfd218bbf55cfbb04378c116c4e390a575c91511308aa7 SHA512 be61f3c907899121e08394647c276f638201e6c1a2d682fac0e559117866e3c1c40fd6283159725504d699b6ad6ef773e980e0e98487aafb80f1c458a3b55959
+DIST chromium-93.0.4542.2.tar.xz 988397092 BLAKE2B 9491aff480ca5200b0ebfa0ddb2082cffe7f86475241d99c320a4c415e36df81696d14323219e8d2a62ae0cc18bdbc03a8f5dff57b95acf25316b842b9c1c648 SHA512 28e00b6e343e74a6abb0d9c60017e37c6ec5e577ac292232cf7d6f13176edc1663f2c4fd5a18a5436b76055d9ac7ec2b4c477dbe59a9a963bd62d447aaf8c56c
 DIST highway-0.12.1.tar.gz 1480579 BLAKE2B 2889f96e33ae4411b14dae2229d86b0581f2044f50d6bb829a83417f0d67f0c9a8c03d552d09a985231ea11e88497fa405efcb85d158b5734b477bec5764a1eb SHA512 d14aeffc80739a5993177fb190ac03998d495004e9c54126c0e0b174c28be52a3f3fe581d8a08db67c34bd00045223d1850e7b384a2e7fe37a8150d7908004cb
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
-EBUILD chromium-91.0.4472.101.ebuild 30004 BLAKE2B c7b8c8f9650cb78a2dec0b8080108a4aca05ebc8abac507741e1a4a19c91e69cc202e2b91408f0c4db3abcba6e92f0f0f82af03051e714e462a721023d8c2ce9 SHA512 4d641af2dd5d63727acfdba0f16a0d9b0f97ca25c75ee5809fa15299e014d31a8cf2cfc1490876d3110d39e5a807c3b5484f4f6ba2fdbbcbca0c0370eaa2e9d5
-EBUILD chromium-92.0.4515.51.ebuild 30140 BLAKE2B 87e82af3627de888e8cc2956e5442f8bd54e6e65539419f3eb2534cd6030a5f8eabb40f958daaafaad386a7a53161efcdd245fc74b45b84c2d69cf4f0452d766 SHA512 78dc38de9d7f2758672be53ae480c3c432048dbd92ccc883036ec09b3fc97e9fdd4eb6484182327e7af9917c5e2ba062b67258e9e2dc9ce70bf60ce9a4288715
-EBUILD chromium-93.0.4535.3.ebuild 30116 BLAKE2B 7e150ce811122f43c88d4465aef20f6628ddc980bf2b7baa12893e00140134ffccc320ce6b6d7a05470f58683b22d6499d32df2788ca1a1d6ff8a6e638b3bbe3 SHA512 69364fb3544c2c9374a5c24009e4f870392324df102a0572595e801a847cb1b0e585fded1bf3f895bb43a21bf58a7863f9726b2b5f0dd4e5a0dd1f71bcfeb5d5
+EBUILD chromium-91.0.4472.106.ebuild 30004 BLAKE2B fabf65aec811906477c4b76c05dee55ae9c20a7573ebacf4cefa3b4a0ab89b690a1c1c5dcc009e5bb416b75c3fa509fbb76306ff23d6702a8981b7b5bd3cecdb SHA512 43b03f73cde551bc677c392e5134d2bb89629f5a3690e67b75d9f3a1c6c7b8e646794d8eb17d72468d8c80d1e6cd6c8f8513fc2678d4672c97d4b918490569f9
+EBUILD chromium-92.0.4515.51.ebuild 30440 BLAKE2B 9459b20d5cff5ff1082e92bdd225cc37c3d0e9ddeb35888a97a970c0fd99a97a37b17dcb68f5e230753e472be16ef0036fa95894fd2ad4986152be9f5b251e8d SHA512 28b1454ef0cfc325b39dc45ec2f776ff98ccc7d21abfc05f52f92f1dc3209e1ef647a8c422a224c784c0ae54ef9b3757f55297344eb4c0739529372f31b238a4
+EBUILD chromium-93.0.4542.2.ebuild 30083 BLAKE2B 3b74444429aa48953176cb12753e533baf7c0257373e7c4f1463da3527dec61ca08b1e0e60804dc43f1167cee262db5be9e1e27c652fb1f127927d30e32b59a3 SHA512 95d9d50f1534afdb11bc397eb1207ff8783f27016b00803681c13605a9e06b551ccfe682e71d3e43437d4aa2b6891c4f385788cd4b8cc33a4904717c0811ab72
 MISC metadata.xml 1519 BLAKE2B e4364e8141099703f087f1733b2d28aa688930f5e9cf4659fc3561af30d4490c611b76728b2bf2d745eb07b1482f59923166ca340740d48a0321fffc908ef4ed SHA512 b6a1e1f04b7e1b92ea2172c4aa89ce67186a6c8abe6dc6502db7b0588a9b3be2d0fa8d43c797f83b95f7d1c7a20381c26ee534082c4b81b17d4105b63aad06e4
diff --git a/www-client/chromium/chromium-91.0.4472.101.ebuild b/www-client/chromium/chromium-91.0.4472.106.ebuild
index 9598116abbb8..ba08b840323b 100644
--- a/www-client/chromium/chromium-91.0.4472.101.ebuild
+++ b/www-client/chromium/chromium-91.0.4472.106.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://chromium.org/"
 PATCHSET="6"
 PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
-PPC64LE_PATCHSET="5"
+PPC64LE_PATCHSET="6"
 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
 	https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip
 	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz
diff --git a/www-client/chromium/chromium-92.0.4515.51.ebuild b/www-client/chromium/chromium-92.0.4515.51.ebuild
index 744bf4df8d58..338eee1281c8 100644
--- a/www-client/chromium/chromium-92.0.4515.51.ebuild
+++ b/www-client/chromium/chromium-92.0.4515.51.ebuild
@@ -15,10 +15,12 @@ DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://chromium.org/"
 PATCHSET="6"
 PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
+PPC64LE_PATCHSET="91-ppc64le-6"
 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
 	https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip
 	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz
-	arm64? ( https://github.com/google/highway/archive/refs/tags/0.12.1.tar.gz -> highway-0.12.1.tar.gz )"
+	arm64? ( https://github.com/google/highway/archive/refs/tags/0.12.1.tar.gz -> highway-0.12.1.tar.gz )
+	ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-${PPC64LE_PATCHSET}.tar.xz )"
 
 LICENSE="BSD"
 SLOT="0"
@@ -243,6 +245,8 @@ src_prepare() {
 		)
 	fi
 
+	use ppc64 && eapply -p0 "${WORKDIR}/${PN}"-ppc64le
+
 	default
 
 	mkdir -p third_party/node/linux/node-linux-x64/bin || die
@@ -749,6 +753,9 @@ src_configure() {
 		append-cxxflags -flax-vector-conversions
 	fi
 
+	# highway/libjxl fail on ppc64 without extra patches, disable for now.
+	use ppc64 && myconf_gn+=" enable_jxl_decoder=false"
+
 	# Disable unknown warning message from clang.
 	tc-is-clang && append-flags -Wno-unknown-warning-option
 
diff --git a/www-client/chromium/chromium-93.0.4535.3.ebuild b/www-client/chromium/chromium-93.0.4542.2.ebuild
index 6274a641629a..c99ac3f994ef 100644
--- a/www-client/chromium/chromium-93.0.4535.3.ebuild
+++ b/www-client/chromium/chromium-93.0.4542.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_8 )
+PYTHON_COMPAT=( python3_{8,9} )
 PYTHON_REQ_USE="xml"
 
 CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
@@ -13,10 +13,9 @@ inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-util
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://chromium.org/"
-PATCHSET="2"
+PATCHSET="3"
 PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
-	https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip
 	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz
 	arm64? ( https://github.com/google/highway/archive/refs/tags/0.12.1.tar.gz -> highway-0.12.1.tar.gz )"
 
@@ -106,10 +105,11 @@ DEPEND="${COMMON_DEPEND}
 # dev-vcs/git - https://bugs.gentoo.org/593476
 BDEPEND="
 	${PYTHON_DEPS}
+	$(python_gen_any_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	')
 	>=app-arch/gzip-1.7
-	app-arch/unzip
 	dev-lang/perl
-	dev-lang/python:2.7[xml]
 	>=dev-util/gn-0.1807
 	dev-vcs/git
 	>=dev-util/gperf-3.0.3
@@ -178,6 +178,10 @@ them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
 in /etc/chromium/default.
 "
 
+python_check_deps() {
+	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
+}
+
 pre_build_checks() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
 		local -x CPP="$(tc-getCXX) -E"
@@ -229,6 +233,7 @@ src_prepare() {
 	local PATCHES=(
 		"${WORKDIR}/patches"
 		"${FILESDIR}/chromium-92-EnumTable-crash.patch"
+		"${FILESDIR}/chromium-93-InkDropHost-crash.patch"
 		"${FILESDIR}/chromium-shim_headers.patch"
 	)
 
@@ -248,9 +253,8 @@ src_prepare() {
 	mkdir -p third_party/node/linux/node-linux-x64/bin || die
 	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
 
-	# adjust python interpreter versions
+	# adjust python interpreter version
 	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
-	sed -i -e "s|python2|python2\.7|g" buildtools/linux64/clang-format || die
 
 	# bundled highway library does not support arm64 with GCC
 	if use arm64; then
@@ -258,6 +262,9 @@ src_prepare() {
 		ln -s "${WORKDIR}/highway-0.12.1" third_party/highway/src || die
 	fi
 
+	# lastchange.py requires initialized git repository
+	git init -q || die
+
 	local keeplibs=(
 		base/third_party/cityhash
 		base/third_party/double_conversion
@@ -477,7 +484,6 @@ src_prepare() {
 		third_party/xcbproto
 		third_party/zxcvbn-cpp
 		third_party/zlib/google
-		tools/grit/third_party/six
 		url/third_party/mozilla
 		v8/src/third_party/siphash
 		v8/src/third_party/valgrind
@@ -648,6 +654,9 @@ src_configure() {
 	# Disable pseudolocales, only used for testing
 	myconf_gn+=" enable_pseudolocales=false"
 
+	# Disable code formating of generated files
+	myconf_gn+=" blink_enable_generated_code_formatting=false"
+
 	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
 	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
 	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
@@ -799,10 +808,6 @@ src_compile() {
 	# Calling this here supports resumption via FEATURES=keepwork
 	python_setup
 
-	# https://bugs.gentoo.org/717456
-	# don't inherit PYTHONPATH from environment, bug #789021
-	local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0"
-
 	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
 
 	# Build mksnapshot and pax-mark it.
diff --git a/www-client/chromium/files/chromium-93-InkDropHost-crash.patch b/www-client/chromium/files/chromium-93-InkDropHost-crash.patch
new file mode 100644
index 000000000000..54d16db56cc2
--- /dev/null
+++ b/www-client/chromium/files/chromium-93-InkDropHost-crash.patch
@@ -0,0 +1,25 @@
+diff --git a/ui/views/animation/ink_drop_host_view.h b/ui/views/animation/ink_drop_host_view.h
+index bd0975b..e5df288 100644
+--- a/ui/views/animation/ink_drop_host_view.h
++++ b/ui/views/animation/ink_drop_host_view.h
+@@ -238,6 +238,11 @@ class VIEWS_EXPORT InkDropHost {
+   // Used to observe View and inform the InkDrop of host-transform changes.
+   ViewLayerTransformObserver host_view_transform_observer_;
+ 
++  // Declared before |ink_drop_|, because InkDropImpl may call
++  // RemoveInkDropLayer on partly destructed InkDropHost. In
++  // that case |ink_drop_mask_| must be still valid.
++  std::unique_ptr<views::InkDropMask> ink_drop_mask_;
++
+   // Should not be accessed directly. Use GetInkDrop() instead.
+   std::unique_ptr<InkDrop> ink_drop_;
+ 
+@@ -261,8 +266,6 @@ class VIEWS_EXPORT InkDropHost {
+   int ink_drop_small_corner_radius_ = 2;
+   int ink_drop_large_corner_radius_ = 4;
+ 
+-  std::unique_ptr<views::InkDropMask> ink_drop_mask_;
+-
+   base::RepeatingCallback<std::unique_ptr<InkDrop>()> create_ink_drop_callback_;
+   base::RepeatingCallback<std::unique_ptr<InkDropRipple>()>
+       create_ink_drop_ripple_callback_;