From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 74B5415800C for ; Mon, 3 Apr 2023 17:32:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A1738E0894; Mon, 3 Apr 2023 17:32:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8451EE0894 for ; Mon, 3 Apr 2023 17:32:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 87FE4335D3C for ; Mon, 3 Apr 2023 17:32:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DD7AD8E4 for ; Mon, 3 Apr 2023 17:32:43 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1680543160.807cb87fc6bf6a6d76ad504a412306dc8b97a60e.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/, www-client/chromium/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/chromium/chromium-111.0.5563.110-r1.ebuild www-client/chromium/chromium-111.0.5563.110.ebuild www-client/chromium/files/chromium-111-InkDropHost-crash.patch X-VCS-Directories: www-client/chromium/ www-client/chromium/files/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 807cb87fc6bf6a6d76ad504a412306dc8b97a60e X-VCS-Branch: master Date: Mon, 3 Apr 2023 17:32:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9cce9019-0285-44c4-b4b2-66e8db082d92 X-Archives-Hash: 36d6084eec646a00653f8d0e1720bbfa commit: 807cb87fc6bf6a6d76ad504a412306dc8b97a60e Author: Mike Gilbert gentoo org> AuthorDate: Mon Apr 3 17:32:12 2023 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon Apr 3 17:32:40 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=807cb87f www-client/chromium: restore InkDropHost-crash patch Signed-off-by: Mike Gilbert gentoo.org> ...10.ebuild => chromium-111.0.5563.110-r1.ebuild} | 1 + .../files/chromium-111-InkDropHost-crash.patch | 25 ++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/www-client/chromium/chromium-111.0.5563.110.ebuild b/www-client/chromium/chromium-111.0.5563.110-r1.ebuild similarity index 99% rename from www-client/chromium/chromium-111.0.5563.110.ebuild rename to www-client/chromium/chromium-111.0.5563.110-r1.ebuild index d41b4c6b4d15..d83cbb6b2169 100644 --- a/www-client/chromium/chromium-111.0.5563.110.ebuild +++ b/www-client/chromium/chromium-111.0.5563.110-r1.ebuild @@ -342,6 +342,7 @@ src_prepare() { "${FILESDIR}/chromium-109-system-zlib.patch" "${FILESDIR}/chromium-109-system-openh264.patch" "${FILESDIR}/chromium-111-ozone-platform.patch" + "${FILESDIR}/chromium-111-InkDropHost-crash.patch" "${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch" "${FILESDIR}/chromium-cross-compile.patch" ) diff --git a/www-client/chromium/files/chromium-111-InkDropHost-crash.patch b/www-client/chromium/files/chromium-111-InkDropHost-crash.patch new file mode 100644 index 000000000000..21dd8e41b8c8 --- /dev/null +++ b/www-client/chromium/files/chromium-111-InkDropHost-crash.patch @@ -0,0 +1,25 @@ +https://chromium-review.googlesource.com/c/chromium/src/+/2959890 + +--- a/ui/views/animation/ink_drop_host.h ++++ b/ui/views/animation/ink_drop_host.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 ink_drop_mask_; ++ + // Should not be accessed directly. Use GetInkDrop() instead. + std::unique_ptr 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 ink_drop_mask_; +- + base::RepeatingCallback()> create_ink_drop_callback_; + base::RepeatingCallback()> + create_ink_drop_ripple_callback_;