commit: 13b3e2393065b5b2984e60a76b18696c95737ec2
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 25 14:33:53 2019 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> 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 <floppym <AT> 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 <[email protected]>
-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=<optimized out>) 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 <[email protected]>
-Reviewed-by: Sigurður Ásgeirsson <[email protected]>
-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.
