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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 18EA1138334 for ; Thu, 25 Jul 2019 14:34:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2149DE0798; Thu, 25 Jul 2019 14:34:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E256EE0798 for ; Thu, 25 Jul 2019 14:34:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9417C348A6F for ; Thu, 25 Jul 2019 14:34:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2A6592A5 for ; Thu, 25 Jul 2019 14:34:26 +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: <1564065233.13b3e2393065b5b2984e60a76b18696c95737ec2.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-75.0.3770.142.ebuild www-client/chromium/files/chromium-75-pure-virtual.patch X-VCS-Directories: www-client/chromium/files/ www-client/chromium/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 13b3e2393065b5b2984e60a76b18696c95737ec2 X-VCS-Branch: master Date: Thu, 25 Jul 2019 14:34:26 +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: 17c7c2fd-a29d-4c13-9efc-15ac62e2eb69 X-Archives-Hash: dfccf6cd8e53b9ff339acd228bff518b commit: 13b3e2393065b5b2984e60a76b18696c95737ec2 Author: Mike Gilbert gentoo org> AuthorDate: Thu Jul 25 14:33:53 2019 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Thu Jul 25 14:33:53 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13b3e239 www-client/chromium: consolidate identical patches Package-Manager: Portage-2.3.68, Repoman-2.3.16_p2 Signed-off-by: Mike Gilbert gentoo.org> www-client/chromium/chromium-75.0.3770.142.ebuild | 2 +- .../chromium/files/chromium-75-pure-virtual.patch | 50 ---------------------- 2 files changed, 1 insertion(+), 51 deletions(-) diff --git a/www-client/chromium/chromium-75.0.3770.142.ebuild b/www-client/chromium/chromium-75.0.3770.142.ebuild index e016cfa1c21..9dc1a9c45b4 100644 --- a/www-client/chromium/chromium-75.0.3770.142.ebuild +++ b/www-client/chromium/chromium-75.0.3770.142.ebuild @@ -150,7 +150,7 @@ PATCHES=( "${FILESDIR}/chromium-75-unique_ptr.patch" "${FILESDIR}/chromium-75-noexcept.patch" "${FILESDIR}/chromium-75-llvm8.patch" - "${FILESDIR}/chromium-75-pure-virtual.patch" + "${FILESDIR}/chromium-76-gcc-pure-virtual.patch" "${FILESDIR}/chromium-75-post-task-crash.patch" ) diff --git a/www-client/chromium/files/chromium-75-pure-virtual.patch b/www-client/chromium/files/chromium-75-pure-virtual.patch deleted file mode 100644 index 3d34e436a28..00000000000 --- a/www-client/chromium/files/chromium-75-pure-virtual.patch +++ /dev/null @@ -1,50 +0,0 @@ -From cdf306db81efaaaa954487585d5a5a16205a5ebd Mon Sep 17 00:00:00 2001 -From: Jose Dapena Paz -Date: Wed, 05 Jun 2019 14:45:06 +0000 -Subject: [PATCH] Avoid pure virtual crash destroying RenderProcessUserData - -When RenderProcessUserData is destroyed from the destructor of -RenderProcessHostImpl, it is done in the destructor of RenderProcessHost. -At this point RemoveObserver override is already freed, so RenderProcessHost -is pure virtual. This crash happens at least building with GCC: - - at /usr/include/c++/8/ext/new_allocator.h:140 - (this=0x7fffffffcb50, __in_chrg=) at /usr/include/c++/8/bits/stl_tree.h:964 - -We need to destroy RenderProcessUserData before that happens. To do that -we can just override RenderProcessHostDestroyed. - -Bug: 910288 -Change-Id: I38107b178829b0cb7494f5333b765e5b087d82cd -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1645366 -Commit-Queue: Sigurður Ásgeirsson -Reviewed-by: Sigurður Ásgeirsson -Cr-Commit-Position: refs/heads/master@{#666279} ---- - -diff --git a/chrome/browser/performance_manager/render_process_user_data.cc b/chrome/browser/performance_manager/render_process_user_data.cc -index 2e2c199..ef6e1fb 100644 ---- a/chrome/browser/performance_manager/render_process_user_data.cc -+++ b/chrome/browser/performance_manager/render_process_user_data.cc -@@ -116,4 +116,9 @@ - base::Unretained(process_node_.get()), info.exit_code)); - } - -+void RenderProcessUserData::RenderProcessHostDestroyed( -+ content::RenderProcessHost* host) { -+ host->RemoveUserData(kRenderProcessUserDataKey); -+} -+ - } // namespace performance_manager -diff --git a/chrome/browser/performance_manager/render_process_user_data.h b/chrome/browser/performance_manager/render_process_user_data.h -index ac74b1d..f3b4d16 100644 ---- a/chrome/browser/performance_manager/render_process_user_data.h -+++ b/chrome/browser/performance_manager/render_process_user_data.h -@@ -47,6 +47,7 @@ - void RenderProcessExited( - content::RenderProcessHost* host, - const content::ChildProcessTerminationInfo& info) override; -+ void RenderProcessHostDestroyed(content::RenderProcessHost* host) override; - - // All instances are linked together in a doubly linked list to allow orderly - // destruction at browser shutdown time.