Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/chromium/files/
Date: Sun, 01 Jan 2023 18:16:38
Message-Id: 1672596972.e5ef5742f88583d5240f9f471fc0ae68f929a94b.conikost@gentoo
1 commit: e5ef5742f88583d5240f9f471fc0ae68f929a94b
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Sun Jan 1 13:46:49 2023 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 1 18:16:12 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5ef5742
7
8 www-client/chromium: remove unused patch
9
10 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
11 Closes: https://github.com/gentoo/gentoo/pull/28922
12 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
13
14 .../files/chromium-98-EnumTable-crash.patch | 76 ----------------------
15 1 file changed, 76 deletions(-)
16
17 diff --git a/www-client/chromium/files/chromium-98-EnumTable-crash.patch b/www-client/chromium/files/chromium-98-EnumTable-crash.patch
18 deleted file mode 100644
19 index f058ec18327a..000000000000
20 --- a/www-client/chromium/files/chromium-98-EnumTable-crash.patch
21 +++ /dev/null
22 @@ -1,76 +0,0 @@
23 -diff --git a/components/cast_channel/enum_table.h b/components/cast_channel/enum_table.h
24 -index 842553a..89de703 100644
25 ---- a/components/cast_channel/enum_table.h
26 -+++ b/components/cast_channel/enum_table.h
27 -@@ -8,6 +8,7 @@
28 - #include <cstdint>
29 - #include <cstring>
30 - #include <ostream>
31 -+#include <vector>
32 -
33 - #include "base/check_op.h"
34 - #include "base/notreached.h"
35 -@@ -187,7 +188,6 @@ class
36 - inline constexpr GenericEnumTableEntry(int32_t value);
37 - inline constexpr GenericEnumTableEntry(int32_t value, base::StringPiece str);
38 -
39 -- GenericEnumTableEntry(const GenericEnumTableEntry&) = delete;
40 - GenericEnumTableEntry& operator=(const GenericEnumTableEntry&) = delete;
41 -
42 - private:
43 -@@ -253,7 +253,6 @@ class EnumTable {
44 - constexpr Entry(E value, base::StringPiece str)
45 - : GenericEnumTableEntry(static_cast<int32_t>(value), str) {}
46 -
47 -- Entry(const Entry&) = delete;
48 - Entry& operator=(const Entry&) = delete;
49 - };
50 -
51 -@@ -312,15 +311,14 @@ class EnumTable {
52 - if (is_sorted_) {
53 - const std::size_t index = static_cast<std::size_t>(value);
54 - if (ANALYZER_ASSUME_TRUE(index < data_.size())) {
55 -- const auto& entry = data_.begin()[index];
56 -+ const auto& entry = data_[index];
57 - if (ANALYZER_ASSUME_TRUE(entry.has_str()))
58 - return entry.str();
59 - }
60 - return absl::nullopt;
61 - }
62 - return GenericEnumTableEntry::FindByValue(
63 -- reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()),
64 -- data_.size(), static_cast<int32_t>(value));
65 -+ &data_[0], data_.size(), static_cast<int32_t>(value));
66 - }
67 -
68 - // This overload of GetString is designed for cases where the argument is a
69 -@@ -348,8 +346,7 @@ class EnumTable {
70 - // enum value directly.
71 - absl::optional<E> GetEnum(base::StringPiece str) const {
72 - auto* entry = GenericEnumTableEntry::FindByString(
73 -- reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()),
74 -- data_.size(), str);
75 -+ &data_[0], data_.size(), str);
76 - return entry ? static_cast<E>(entry->value) : absl::optional<E>();
77 - }
78 -
79 -@@ -364,7 +361,7 @@ class EnumTable {
80 - // Align the data on a cache line boundary.
81 - alignas(64)
82 - #endif
83 -- std::initializer_list<Entry> data_;
84 -+ const std::vector<Entry> data_;
85 - bool is_sorted_;
86 -
87 - constexpr EnumTable(std::initializer_list<Entry> data, bool is_sorted)
88 -@@ -376,8 +373,8 @@ class EnumTable {
89 -
90 - for (std::size_t i = 0; i < data.size(); i++) {
91 - for (std::size_t j = i + 1; j < data.size(); j++) {
92 -- const Entry& ei = data.begin()[i];
93 -- const Entry& ej = data.begin()[j];
94 -+ const Entry& ei = data[i];
95 -+ const Entry& ej = data[j];
96 - DCHECK(ei.value != ej.value)
97 - << "Found duplicate enum values at indices " << i << " and " << j;
98 - DCHECK(!(ei.has_str() && ej.has_str() && ei.str() == ej.str()))