commit: db2726edc645a51beae5aeafed19c8ec46f456c2 Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org> AuthorDate: Thu Feb 18 22:07:29 2021 +0000 Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org> CommitDate: Thu Feb 18 22:07:46 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db2726ed
www-client/chromium: beta channel bump to 89.0.4389.58 Bug: https://bugs.gentoo.org/770214 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org> www-client/chromium/Manifest | 2 +- ...4389.47.ebuild => chromium-89.0.4389.58.ebuild} | 1 + .../files/chromium-89-empty-map-crash.patch | 39 ++++++++++++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 34d22290f99..063136fb5e8 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -2,7 +2,7 @@ DIST chromium-88-patchset-3.tar.xz 8396 BLAKE2B 4c978f1a6efef3f71e3dd6340c392b74 DIST chromium-88.0.4324.150.tar.xz 857377456 BLAKE2B 65f3d4a0f930743d04786a21c10561a93a2eb27c2c06d260495ead6ebf9344b2938f28c083a4077c9d2413f47cb083a83633b571ab1f54b25823fc8db18f504b SHA512 5e0419ce26e58b6ba30586c806fa3001f6c3c094e09c82fb08ed828a199c582308ce9bc0ea445aa0214d29710a586bf5a972553fbef5eab574fb0dc3ebe6280b DIST chromium-88.0.4324.182.tar.xz 857221352 BLAKE2B 7263294154232533f18d0bc8eeaa7097c3578f8e585ce953c9e6990ec7c9ffbfbd0e69f89c4852c09197aab592877350f54590cf4f0bbec9481886f3fc34548a SHA512 ce8d507645e937107847199b55287ec5522e778851367a19c4cfa4ff5fae18e7c7ea999aa7b0ad0758fab68a003f201bf38ae51e3642388705de2ada9be87730 DIST chromium-89-patchset-6.tar.xz 4308 BLAKE2B 22e2db8b5e287925f8b550075e48ad381ccf7ef54e23d8f4e4aedff7fd6cfee8f9e70eff1edb8c867c256ee5ec881ef9379e18278b84b47ff08dcc00f5801667 SHA512 aa5d902c1959f50eb9a0d773a77bf12e5a955d796ee8b18f6e2143573dd73beec62109940e55a858fd9927753dba1d3bf9c1bd940b18a616e7b70b801e93f041 -DIST chromium-89.0.4389.47.tar.xz 890733548 BLAKE2B 55482566fce0d30abed7fe88514314f14860ba2f876af532c7b566c9b32d1caf79ecccd8cc03af7b9cac4457038abf4e5006c8bfb75fd308200f7290f3431d39 SHA512 f6828d3d9a346e508511eee8cef63ad6ae4327adb90a6bcb392e862e8406b50798f0d73306794283aaab84550547b31c2b9e90e2068740b9123115796f9a082f +DIST chromium-89.0.4389.58.tar.xz 890700788 BLAKE2B c8310497671ba1e528d31412e51f7dbbcd2a91a4a1537bd6fdd6acabffa4daad59df0fd9aed1ee92d6e07787f856f32b1f04af311bbb6d9e8c44214e330291fe SHA512 617db2e37cf668faf294167aba81be447e3a50c94c0bc8efa9b18964d18ef57c9dac26aae337f79f01773b69ec39c60117eb10fd102016da1f06de65a1979edc DIST chromium-90-patchset-3.tar.xz 5344 BLAKE2B 19b9d69d5d4aecc18e1a3867fd0c53d01dd873fd533b83fbd8c25d435976dd2176975ccf5d4ebb04f84b6c1c0a009315ef4344fbf575b8ae6942ddfb12d1e1e1 SHA512 97d756b4b4270c7631ca42792e869815c22a786ebba36c2668b99298bcd60f24fd89b52d2491ade07341c20f2bdac933b46b299e52bfe9e45cb57bf056ee050c DIST chromium-90.0.4412.3.tar.xz 920864492 BLAKE2B a0d5e6ddc552611231c7ba8fd81da4d2e01e59695eccce33c040ffdd37fa360008cf8c8095f10622902a5e25297db4c10b5c463fdca5e5c46d390db4268f3d17 SHA512 bf168dd2a817823bd9ec7b7c925cddd783366460011782884f02ef15952546d6edef6bb2f08813bfd8be2e64c787e80c2cd449032b9eaf19d2ea7a6eb2294da8 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf diff --git a/www-client/chromium/chromium-89.0.4389.47.ebuild b/www-client/chromium/chromium-89.0.4389.58.ebuild similarity index 99% rename from www-client/chromium/chromium-89.0.4389.47.ebuild rename to www-client/chromium/chromium-89.0.4389.58.ebuild index dca398dbb76..9e6ff4e6370 100644 --- a/www-client/chromium/chromium-89.0.4389.47.ebuild +++ b/www-client/chromium/chromium-89.0.4389.58.ebuild @@ -233,6 +233,7 @@ src_prepare() { "${WORKDIR}/patches" "${FILESDIR}/chromium-89-webcodecs-deps.patch" "${FILESDIR}/chromium-89-EnumTable-crash.patch" + "${FILESDIR}/chromium-89-empty-map-crash.patch" "${FILESDIR}/chromium-shim_headers.patch" ) diff --git a/www-client/chromium/files/chromium-89-empty-map-crash.patch b/www-client/chromium/files/chromium-89-empty-map-crash.patch new file mode 100644 index 00000000000..9c00b83f4af --- /dev/null +++ b/www-client/chromium/files/chromium-89-empty-map-crash.patch @@ -0,0 +1,39 @@ +From 9e0bf3bb5954cc8848e33d6806a67e75199e7ceb Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann <sth...@googlemail.com> +Date: Tue, 16 Feb 2021 19:51:38 +0000 +Subject: [PATCH] fix crash if smooth_thread_history_ is empty + +https://crrev.com/11ce5ea added smooth_thread_history_, but does +not handle an empty std::map correctly. Decrementing iterator +returned by lower_bound() only works, if the map is non-empty. + +Bug: 1169818 +Change-Id: If75c3d4c7412e77b3ae6c3e68fa3e3821dc75764 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2692534 +Reviewed-by: Behdad Bakhshinategh <behd...@chromium.org> +Reviewed-by: Sadrul Chowdhury <sad...@chromium.org> +Commit-Queue: Behdad Bakhshinategh <behd...@chromium.org> +Cr-Commit-Position: refs/heads/master@{#854397} +--- + +diff --git a/cc/metrics/compositor_frame_reporting_controller.cc b/cc/metrics/compositor_frame_reporting_controller.cc +index 6713366..dec573d1 100644 +--- a/cc/metrics/compositor_frame_reporting_controller.cc ++++ b/cc/metrics/compositor_frame_reporting_controller.cc +@@ -440,10 +440,12 @@ + } + + // keep the history for the last 3 seconds. +- auto expired_smooth_thread = smooth_thread_history_.lower_bound( +- Now() - base::TimeDelta::FromSeconds(3))--; +- smooth_thread_history_.erase(smooth_thread_history_.begin(), +- expired_smooth_thread); ++ if (!smooth_thread_history_.empty()) { ++ auto expired_smooth_thread = smooth_thread_history_.lower_bound( ++ Now() - base::TimeDelta::FromSeconds(3))--; ++ smooth_thread_history_.erase(smooth_thread_history_.begin(), ++ expired_smooth_thread); ++ } + + // Only trackes the history if there is a change in smooth_thread_ + if (current_smooth_thread != GetSmoothThread()) {
