$ git diff --patch-with-stat --summary 25669cd49887587555649b6dfaa3e964e0f5eb44..3a602e6da6507fd50d6c10c0ffa6076e7dbd1588
.abf.yml | 5 +-
arm_use_right_compiler.patch | 30 --
...um-100.0.4896.60-widevine-other-locations.patch | 20 ++
chromium-102-python3.11.patch | 11 +
chromium-60.0.3112.78-jpeg-nomangle.patch | 14 -
chromium-69-no-static-libstdc++.patch | 6 +-
chromium-69-wmvflvmpg.patch | 115 -------
chromium-75.0.3770.80-grpc-gettid-fix.patch | 22 --
...mium-76.0.3809.100-gcc-remoting-constexpr.patch | 27 --
chromium-78-protobuf-RepeatedPtrField-export.patch | 13 -
chromium-78.0.3904.70-gcc9-drop-rsp-clobber.patch | 24 --
chromium-79-gcc-protobuf-alignas.patch | 81 -----
...ium-79.0.3945.56-widevine-other-locations.patch | 19 --
...StreamSendBuffer-deleted-move-constructor.patch | 30 --
chromium-81-extra-media.patch | 366 ---------------------
chromium-83-disable-fontconfig-cache-magic.patch | 13 -
chromium-84-blink-disable-clang-format.patch | 18 -
chromium-86-ImageMemoryBarrierData-init.patch | 12 -
chromium-86-nearby-explicit.patch | 25 --
chromium-86-nearby-include.patch | 11 -
chromium-87-CursorFactory-include.patch | 36 --
chromium-87-compiler.patch | 153 ---------
chromium-87-openscreen-include.patch | 25 --
chromium-88-buildfixes.patch | 37 ---
chromium-88-less-blacklist-nonsense.patch | 2 +-
chromium-89-buildfixes.patch | 12 -
chromium-90-compilefixes.patch | 49 ---
chromium-92-fix-bogus-assert.patch | 13 -
chromium-92-skia-freetype-2.11.patch | 36 --
chromium-93-buildfix.patch | 12 -
chromium-93-ffmpeg-4.4.patch | 36 --
chromium-94-compiler.patch | 12 -
chromium-94-glibc-2.34.patch | 24 --
chromium-97-compilefixes.patch | 33 --
... => chromium-98.0.4758.80-EnumTable-crash.patch | 21 +-
chromium-99.0.4844.84-markdownsafe-soft_str.patch | 148 +++++++++
chromium-browser-stable.spec | 33 +-
chromium-fix-char_traits.patch | 14 -
chromium-glibc-2.33.patch | 141 --------
chromium-libxml-unbundle.patch | 10 +
chromium-skia-harmony.patch | 14 -
chromium-system-icu.patch | 30 --
reverse-roll-src-third_party-ffmpeg.patch | 287 ++++++++++++++++
sql-VirtualCursor-standard-layout.patch | 231 -------------
sql-make-VirtualCursor-standard-layout-type.patch | 210 ------------
subpixel-anti-aliasing-in-FreeType-2.8.1.patch | 100 ------
vdpau-support.patch | 101 ------
wayland-egl.patch | 22 --
48 files changed, 512 insertions(+), 2192 deletions(-)
delete mode 100644 arm_use_right_compiler.patch
create mode 100644 chromium-100.0.4896.60-widevine-other-locations.patch
create mode 100644 chromium-102-python3.11.patch
delete mode 100644 chromium-60.0.3112.78-jpeg-nomangle.patch
delete mode 100644 chromium-69-wmvflvmpg.patch
delete mode 100644 chromium-75.0.3770.80-grpc-gettid-fix.patch
delete mode 100644 chromium-76.0.3809.100-gcc-remoting-constexpr.patch
delete mode 100644 chromium-78-protobuf-RepeatedPtrField-export.patch
delete mode 100644 chromium-78.0.3904.70-gcc9-drop-rsp-clobber.patch
delete mode 100644 chromium-79-gcc-protobuf-alignas.patch
delete mode 100644 chromium-79.0.3945.56-widevine-other-locations.patch
delete mode 100644 chromium-80-QuicStreamSendBuffer-deleted-move-constructor.patch
delete mode 100644 chromium-81-extra-media.patch
delete mode 100644 chromium-83-disable-fontconfig-cache-magic.patch
delete mode 100644 chromium-84-blink-disable-clang-format.patch
delete mode 100644 chromium-86-ImageMemoryBarrierData-init.patch
delete mode 100644 chromium-86-nearby-explicit.patch
delete mode 100644 chromium-86-nearby-include.patch
delete mode 100644 chromium-87-CursorFactory-include.patch
delete mode 100644 chromium-87-compiler.patch
delete mode 100644 chromium-87-openscreen-include.patch
delete mode 100644 chromium-88-buildfixes.patch
delete mode 100644 chromium-89-buildfixes.patch
delete mode 100644 chromium-90-compilefixes.patch
delete mode 100644 chromium-92-fix-bogus-assert.patch
delete mode 100644 chromium-92-skia-freetype-2.11.patch
delete mode 100644 chromium-93-buildfix.patch
delete mode 100644 chromium-93-ffmpeg-4.4.patch
delete mode 100644 chromium-94-compiler.patch
delete mode 100644 chromium-94-glibc-2.34.patch
rename chromium-96-EnumTable-crash.patch => chromium-98.0.4758.80-EnumTable-crash.patch (79%)
create mode 100644 chromium-99.0.4844.84-markdownsafe-soft_str.patch
delete mode 100644 chromium-fix-char_traits.patch
delete mode 100644 chromium-glibc-2.33.patch
create mode 100644 chromium-libxml-unbundle.patch
delete mode 100644 chromium-skia-harmony.patch
delete mode 100644 chromium-system-icu.patch
create mode 100644 reverse-roll-src-third_party-ffmpeg.patch
delete mode 100644 sql-VirtualCursor-standard-layout.patch
delete mode 100644 sql-make-VirtualCursor-standard-layout-type.patch
delete mode 100644 subpixel-anti-aliasing-in-FreeType-2.8.1.patch
delete mode 100644 vdpau-support.patch
delete mode 100644 wayland-egl.patch
diff --git a/.abf.yml b/.abf.yml
index 82e7556..9f3f9e9 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,4 +1,3 @@
sources:
- master_preferences: ea2028a0f4e3b10d701dc8678dfa7af1d43a0558
- chromium-97-patchset-4.tar.xz: 12096352da60206bd4d0f26039104614a8a18459
- chromium-97.0.4692.99.tar.xz: c9f525e5eb01b30e68c1c330d7c4975d208fe4fb
+ chromium-102-patchset-6.tar.xz: dc5cc65cb636762dd68f23a7009d09dec4166698
+ chromium-102.0.5005.61.tar.xz: abdbab7a0a39813a71d86a20a2900c9008d48d87
diff --git a/arm_use_right_compiler.patch b/arm_use_right_compiler.patch
deleted file mode 100644
index 1530258..0000000
--- a/arm_use_right_compiler.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- chromium-54.0.2840.59/build/toolchain/linux/BUILD.gn 2016-08-25 12:19:55.634174140 +0200
-+++ chromium-54.0.2840.59/build/toolchain/linux/BUILD.gn 2016-08-25 12:19:55.634174140 +0200
-@@ -6,7 +6,7 @@
- }
-
- clang_toolchain("clang_arm") {
-- toolprefix = "arm-linux-gnueabihf-"
-+ toolprefix = ""
- toolchain_args = {
- current_cpu = "arm"
- current_os = "linux"
-@@ -14,7 +14,7 @@
- }
-
- clang_toolchain("clang_arm64") {
-- toolprefix = "aarch64-linux-gnu-"
-+ toolprefix = ""
- toolchain_args = {
- current_cpu = "arm64"
- current_os = "linux"
-@@ -22,7 +22,7 @@
- }
-
- gcc_toolchain("arm") {
-- toolprefix = "arm-linux-gnueabihf-"
-+ toolprefix = ""
-
- cc = "${toolprefix}gcc"
- cxx = "${toolprefix}g++"
-
diff --git a/chromium-100.0.4896.60-widevine-other-locations.patch b/chromium-100.0.4896.60-widevine-other-locations.patch
new file mode 100644
index 0000000..a123b27
--- /dev/null
+++ b/chromium-100.0.4896.60-widevine-other-locations.patch
@@ -0,0 +1,20 @@
+diff -up chromium-100.0.4896.60/chrome/common/chrome_paths.cc.widevine-other-locations chromium-100.0.4896.60/chrome/common/chrome_paths.cc
+--- chromium-100.0.4896.60/chrome/common/chrome_paths.cc.widevine-other-locations 2022-04-02 15:48:56.944051789 +0000
++++ chromium-100.0.4896.60/chrome/common/chrome_paths.cc 2022-04-02 15:52:34.825642103 +0000
+@@ -319,6 +319,16 @@ bool PathProvider(int key, base::FilePat
+
+ #if BUILDFLAG(ENABLE_WIDEVINE)
+ case chrome::DIR_BUNDLED_WIDEVINE_CDM:
++ base::PathService::Get(base::DIR_HOME, &cur);
++ cur = cur.Append(FILE_PATH_LITERAL(".local/lib/libwidevinecdm.so"));
++ if (base::PathExists(cur)) {
++ break;
++ }
++ // Yes, this has an arch hardcoded in the path, but at this time, it is the only place to find libwidevinecdm.so
++ if (base::PathExists(base::FilePath(FILE_PATH_LITERAL("/opt/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so")))) {
++ cur = base::FilePath(FILE_PATH_LITERAL("/opt/google/chrome/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so"));
++ break;
++ }
+ if (!GetComponentDirectory(&cur))
+ return false;
+ cur = cur.AppendASCII(kWidevineCdmBaseDirectory);
diff --git a/chromium-102-python3.11.patch b/chromium-102-python3.11.patch
new file mode 100644
index 0000000..d75321f
--- /dev/null
+++ b/chromium-102-python3.11.patch
@@ -0,0 +1,11 @@
+--- ./tools/grit/grit/util.py.orig 2022-06-04 09:56:57.348567600 +0100
++++ ./tools/grit/grit/util.py 2022-06-04 09:57:05.700173992 +0100
+@@ -209,7 +209,7 @@
+ mode = 'rb'
+ encoding = None
+ else:
+- mode = 'rU'
++ mode = 'r'
+
+ with io.open(filename, mode, encoding=encoding) as f:
+ return f.read()
diff --git a/chromium-60.0.3112.78-jpeg-nomangle.patch b/chromium-60.0.3112.78-jpeg-nomangle.patch
deleted file mode 100644
index 0b758a4..0000000
--- a/chromium-60.0.3112.78-jpeg-nomangle.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up chromium-60.0.3112.78/third_party/libjpeg_turbo/jpeglib.h.nomangle chromium-60.0.3112.78/third_party/libjpeg_turbo/jpeglib.h
---- chromium-60.0.3112.78/third_party/libjpeg_turbo/jpeglib.h.nomangle 2017-08-01 15:29:00.870759406 -0400
-+++ chromium-60.0.3112.78/third_party/libjpeg_turbo/jpeglib.h 2017-08-01 15:29:09.326593414 -0400
-@@ -18,10 +18,6 @@
- #ifndef JPEGLIB_H
- #define JPEGLIB_H
-
--/* Begin chromium edits */
--#include "jpeglibmangler.h"
--/* End chromium edits */
--
- /*
- * First we include the configuration files that record how this
- * installation of the JPEG library is set up. jconfig.h can be
diff --git a/chromium-69-no-static-libstdc++.patch b/chromium-69-no-static-libstdc++.patch
index 6c2196d..d70d268 100644
--- a/chromium-69-no-static-libstdc++.patch
+++ b/chromium-69-no-static-libstdc++.patch
@@ -2,11 +2,11 @@ diff -up chromium-84.0.4147.38/tools/gn/build/gen.py.30~ chromium-84.0.4147.38/t
--- chromium-84.0.4147.38/tools/gn/build/gen.py.30~ 2020-06-06 20:37:39.523170465 +0200
+++ chromium-84.0.4147.38/tools/gn/build/gen.py 2020-06-06 20:42:47.505925938 +0200
@@ -105,7 +105,7 @@ def main(argv):
- parser.add_option('--no-strip', action='store_true',
+ args_list.add('--no-strip', action='store_true',
help='Don\'t strip release build. Useful for profiling.')
- parser.add_option('--no-static-libstdc++', action='store_true',
+ args_list.add('--no-static-libstdc++', action='store_true',
- default=False, dest='no_static_libstdcpp',
+ default=True, dest='no_static_libstdcpp',
help='Don\'t link libstdc++ statically')
- parser.add_option('--link-lib',
+ args_list.add('--link-lib',
action='append',
diff --git a/chromium-69-wmvflvmpg.patch b/chromium-69-wmvflvmpg.patch
deleted file mode 100644
index 5bcfde6..0000000
--- a/chromium-69-wmvflvmpg.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-diff -up chromium-62.0.3192.0/media/base/mime_util_internal.cc.wmvflvmpg chromium-62.0.3192.0/media/base/mime_util_internal.cc
---- chromium-62.0.3192.0/media/base/mime_util_internal.cc.wmvflvmpg 2017-08-30 15:52:00.602204610 +0200
-+++ chromium-62.0.3192.0/media/base/mime_util_internal.cc 2017-08-30 16:08:19.855437935 +0200
-@@ -91,6 +91,17 @@
- {"mp2", MimeUtil::MP2},
- {"mp4v.20.8", MimeUtil::MPEG4_SP},
- {"mp4v.20.240", MimeUtil::MPEG4_ASP},
-+ {"msmpeg4v1", MimeUtil::MSMPEG4v1},
-+ {"msmpeg4v2", MimeUtil::MSMPEG4v2},
-+ {"msmpeg4v3", MimeUtil::MSMPEG4v3},
-+ {"wmv7", MimeUtil::WMV7},
-+ {"wmv8", MimeUtil::WMV8},
-+ {"wmv9", MimeUtil::WMV9},
-+ {"vc-1", MimeUtil::VC1},
-+ {"wma", MimeUtil::WMA},
-+ {"vp6", MimeUtil::VP6},
-+ {"mpeg1", MimeUtil::MPEG1},
-+ {"flv", MimeUtil::FLV1},
- });
-
- return *kStringToCodecMap;
-@@ -323,6 +333,7 @@
- CodecSet webm_codecs(webm_audio_codecs);
- webm_codecs.insert(webm_video_codecs.begin(), webm_video_codecs.end());
-
-+ const CodecSet mp1_codecs{MPEG1};
- const CodecSet mp3_codecs{MP3, MP2};
-
- CodecSet mp4_audio_codecs{FLAC, MP3, OPUS, MP2, DTS, AC3, EAC3};
-@@ -366,6 +377,28 @@
- CodecSet mp4_codecs(mp4_audio_codecs);
- mp4_codecs.insert(mp4_video_codecs.begin(), mp4_video_codecs.end());
-
-+ const CodecSet wma_codecs{WMA};
-+
-+ CodecSet wmv_codecs(wma_codecs);
-+ wmv_codecs.emplace(MSMPEG4v1);
-+ wmv_codecs.emplace(MSMPEG4v2);
-+ wmv_codecs.emplace(MSMPEG4v3);
-+ wmv_codecs.emplace(MPEG4_SP);
-+ wmv_codecs.emplace(MPEG4_ASP);
-+ wmv_codecs.emplace(WMV7);
-+ wmv_codecs.emplace(WMV8);
-+ wmv_codecs.emplace(WMV9);
-+ wmv_codecs.emplace(VC1);
-+
-+ matroska_codecs.emplace(MSMPEG4v1);
-+ matroska_codecs.emplace(MSMPEG4v2);
-+ matroska_codecs.emplace(MSMPEG4v3);
-+
-+ CodecSet flv_codecs(mp4_codecs);
-+ flv_codecs.emplace(VP6);
-+ flv_codecs.emplace(MP3);
-+ flv_codecs.emplace(FLV1);
-+
- const CodecSet implicit_codec;
- AddContainerWithCodecs("audio/wav", wav_codecs);
- AddContainerWithCodecs("audio/x-wav", wav_codecs);
-@@ -389,6 +421,11 @@
- AddContainerWithCodecs("audio/x-matroska", matroska_audio_codecs);
- AddContainerWithCodecs("video/x-matroska", matroska_codecs);
- AddContainerWithCodecs("video/x-msvideo", matroska_codecs);
-+ AddContainerWithCodecs("video/x-ms-wmv", wmv_codecs);
-+ AddContainerWithCodecs("audio/x-ms-wma", wma_codecs);
-+ AddContainerWithCodecs("video/x-ms-asf", wmv_codecs);
-+ AddContainerWithCodecs("video/x-flv", flv_codecs);
-+ AddContainerWithCodecs("video/mpeg", mp1_codecs);
-
- #if BUILDFLAG(USE_PROPRIETARY_CODECS)
- AddContainerWithCodecs("audio/aac", implicit_codec); // AAC / ADTS.
-diff -up chromium-62.0.3192.0/net/base/mime_util.cc.wmvflvmpg chromium-62.0.3192.0/net/base/mime_util.cc
---- chromium-62.0.3192.0/net/base/mime_util.cc.wmvflvmpg 2017-08-30 15:52:00.604204573 +0200
-+++ chromium-62.0.3192.0/net/base/mime_util.cc 2017-08-30 16:08:50.210885222 +0200
-@@ -94,6 +94,10 @@ static const MimeInfo kPrimaryMappings[]
- {"video/x-matroska", "mkv"},
- {"audio/x-matroska", "mkv"},
- {"video/x-msvideo", "avi"},
-+ {"video/x-ms-wmv", "wmv"},
-+ {"audio/x-ms-wma", "wma"},
-+ {"video/x-flv", "flv"},
-+ {"video/mpeg", "mpg,mpeg"},
- {"multipart/related", "mht,mhtml"},
- {"text/css", "css"},
- {"text/html", "html,htm,shtml,shtm"},
-@@ -512,6 +516,7 @@ static const char* const kStandardVideoT
- "video/sd-video",
- "video/webm",
- "video/x-dv",
-+ "video/x-flv",
- "video/x-m4v",
- "video/x-matroska",
- "video/x-mpeg",
-diff -up chromium-86.0.4240.111/media/base/mime_util_internal.h.media~ chromium-86.0.4240.111/media/base/mime_util_internal.h
---- chromium-86.0.4240.111/media/base/mime_util_internal.h.media~ 2020-10-21 17:03:42.549720159 +0200
-+++ chromium-86.0.4240.111/media/base/mime_util_internal.h 2020-10-21 17:06:08.631768545 +0200
-@@ -51,7 +51,18 @@ class MEDIA_EXPORT MimeUtil {
- MP2,
- MPEG4_SP,
- MPEG4_ASP,
-- LAST_CODEC = MPEG4_ASP
-+ MSMPEG4v1,
-+ MSMPEG4v2,
-+ MSMPEG4v3,
-+ WMV7,
-+ WMV8,
-+ WMV9,
-+ VC1,
-+ WMA,
-+ VP6,
-+ FLV1,
-+ MPEG1,
-+ LAST_CODEC = MPEG1
- };
-
- // Platform configuration structure. Controls which codecs are supported at
diff --git a/chromium-75.0.3770.80-grpc-gettid-fix.patch b/chromium-75.0.3770.80-grpc-gettid-fix.patch
deleted file mode 100644
index c526f4a..0000000
--- a/chromium-75.0.3770.80-grpc-gettid-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up chromium-75.0.3770.80/third_party/grpc/src/src/core/lib/gpr/log_linux.cc.gettid-fix chromium-75.0.3770.80/third_party/grpc/src/src/core/lib/gpr/log_linux.cc
---- chromium-75.0.3770.80/third_party/grpc/src/src/core/lib/gpr/log_linux.cc.gettid-fix 2019-06-12 17:05:01.720907204 -0400
-+++ chromium-75.0.3770.80/third_party/grpc/src/src/core/lib/gpr/log_linux.cc 2019-06-12 17:06:01.000671370 -0400
-@@ -40,7 +40,8 @@
- #include <time.h>
- #include <unistd.h>
-
--static long gettid(void) { return syscall(__NR_gettid); }
-+/* renamed to avoid conflict with glibc 'gettid()' */
-+static long gettid_gpr(void) { return syscall(__NR_gettid); }
-
- void gpr_log(const char* file, int line, gpr_log_severity severity,
- const char* format, ...) {
-@@ -70,7 +71,7 @@ void gpr_default_log(gpr_log_func_args*
- gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME);
- struct tm tm;
- static __thread long tid = 0;
-- if (tid == 0) tid = gettid();
-+ if (tid == 0) tid = gettid_gpr();
-
- timer = static_cast<time_t>(now.tv_sec);
- final_slash = strrchr(args->file, '/');
diff --git a/chromium-76.0.3809.100-gcc-remoting-constexpr.patch b/chromium-76.0.3809.100-gcc-remoting-constexpr.patch
deleted file mode 100644
index aec3107..0000000
--- a/chromium-76.0.3809.100-gcc-remoting-constexpr.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -up chromium-76.0.3809.100/remoting/signaling/message_tracker.cc.gcc-constexpr chromium-76.0.3809.100/remoting/signaling/message_tracker.cc
---- chromium-76.0.3809.100/remoting/signaling/message_tracker.cc.gcc-constexpr 2019-08-09 16:48:08.000000000 +0200
-+++ chromium-76.0.3809.100/remoting/signaling/message_tracker.cc 2019-08-20 21:29:14.545465656 +0200
-@@ -9,8 +9,7 @@
- namespace remoting {
-
- // static
--const base::TimeDelta MessageTracker::kCleanupInterval =
-- base::TimeDelta::FromMinutes(2);
-+constexpr base::TimeDelta MessageTracker::kCleanupInterval;
-
- MessageTracker::MessageTracker() = default;
-
-diff -up chromium-76.0.3809.100/remoting/signaling/message_tracker.h.gcc-constexpr chromium-76.0.3809.100/remoting/signaling/message_tracker.h
---- chromium-76.0.3809.100/remoting/signaling/message_tracker.h.gcc-constexpr 2019-08-20 22:02:25.625970954 +0200
-+++ chromium-76.0.3809.100/remoting/signaling/message_tracker.h 2019-08-20 21:28:23.371952434 +0200
-@@ -36,7 +36,8 @@ class MessageTracker final {
-
- // All IDs older than now - kCleanupInterval will be eventually removed, but
- // they are not guaranteed to be immediately removed after the interval.
-- static const base::TimeDelta kCleanupInterval;
-+ static constexpr base::TimeDelta kCleanupInterval =
-+ base::TimeDelta::FromMinutes(2);
-
- void RemoveExpiredIds();
-
-diff -up chromium-76.0.3809.100/remoting/signaling/message_tracker_unittest.cc.gcc-constexpr chromium-76.0.3809.100/remoting/signaling/message_tracker_unittest.cc
diff --git a/chromium-78-protobuf-RepeatedPtrField-export.patch b/chromium-78-protobuf-RepeatedPtrField-export.patch
deleted file mode 100644
index ddb9e80..0000000
--- a/chromium-78-protobuf-RepeatedPtrField-export.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/third_party/protobuf/src/google/protobuf/repeated_field.h b/third_party/protobuf/src/google/protobuf/repeated_field.h
-index b5b193c..4434854 100644
---- a/third_party/protobuf/src/google/protobuf/repeated_field.h
-+++ b/third_party/protobuf/src/google/protobuf/repeated_field.h
-@@ -804,7 +804,7 @@ class StringTypeHandler {
- // RepeatedPtrField is like RepeatedField, but used for repeated strings or
- // Messages.
- template <typename Element>
--class RepeatedPtrField final : private internal::RepeatedPtrFieldBase {
-+class PROTOBUF_EXPORT RepeatedPtrField final : private internal::RepeatedPtrFieldBase {
- public:
- RepeatedPtrField();
- explicit RepeatedPtrField(Arena* arena);
diff --git a/chromium-78.0.3904.70-gcc9-drop-rsp-clobber.patch b/chromium-78.0.3904.70-gcc9-drop-rsp-clobber.patch
deleted file mode 100644
index 6785b09..0000000
--- a/chromium-78.0.3904.70-gcc9-drop-rsp-clobber.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up chromium-78.0.3904.70/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h.gcc9 chromium-78.0.3904.70/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h
---- chromium-78.0.3904.70/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h.gcc9 2019-10-23 08:58:16.153251961 -0400
-+++ chromium-78.0.3904.70/third_party/tcmalloc/chromium/src/base/linux_syscall_support.h 2019-10-23 08:58:36.896862347 -0400
-@@ -1486,7 +1486,7 @@ struct kernel_stat {
- "d"(LSS_SYSCALL_ARG(parent_tidptr)),
- "r"(LSS_SYSCALL_ARG(newtls)),
- "r"(LSS_SYSCALL_ARG(child_tidptr))
-- : "rsp", "memory", "r8", "r10", "r11", "rcx");
-+ : "memory", "r8", "r10", "r11", "rcx");
- }
- LSS_RETURN(int, __res);
- }
-diff -up chromium-78.0.3904.70/third_party/tcmalloc/vendor/src/base/linux_syscall_support.h.gcc9 chromium-78.0.3904.70/third_party/tcmalloc/vendor/src/base/linux_syscall_support.h
---- chromium-78.0.3904.70/third_party/tcmalloc/vendor/src/base/linux_syscall_support.h.gcc9 2019-10-23 08:58:59.623435488 -0400
-+++ chromium-78.0.3904.70/third_party/tcmalloc/vendor/src/base/linux_syscall_support.h 2019-10-23 08:59:16.113125772 -0400
-@@ -1485,7 +1485,7 @@ struct kernel_stat {
- "d"(LSS_SYSCALL_ARG(parent_tidptr)),
- "r"(LSS_SYSCALL_ARG(newtls)),
- "r"(LSS_SYSCALL_ARG(child_tidptr))
-- : "rsp", "memory", "r8", "r10", "r11", "rcx");
-+ : "memory", "r8", "r10", "r11", "rcx");
- }
- LSS_RETURN(int, __res);
- }
diff --git a/chromium-79-gcc-protobuf-alignas.patch b/chromium-79-gcc-protobuf-alignas.patch
deleted file mode 100644
index 20180c4..0000000
--- a/chromium-79-gcc-protobuf-alignas.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 5d66d5907ac3e76d1e382b8a8e8afe653bd00f4c Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Sun, 31 May 2020 13:59:15 +0000
-Subject: [PATCH] Fix GCC build with PROTOBUF_USE_DLLS enabled
-
-GCC does not allow mixing __attribute__(()) syntax and alignas()
-syntax. Re-use approach from chromium base/compiler_specific.h
----
- .../protobuf/src/google/protobuf/arena.h | 2 +-
- .../protobuf/src/google/protobuf/port_def.inc | 29 +++++++++++++++++++
- .../src/google/protobuf/port_undef.inc | 1 +
- 3 files changed, 31 insertions(+), 1 deletion(-)
-
-diff --git a/third_party/protobuf/src/google/protobuf/arena.h b/third_party/protobuf/src/google/protobuf/arena.h
-index dedc221..a8515ce 100644
---- a/third_party/protobuf/src/google/protobuf/arena.h
-+++ b/third_party/protobuf/src/google/protobuf/arena.h
-@@ -245,7 +245,7 @@ struct ArenaOptions {
- // well as protobuf container types like RepeatedPtrField and Map. The protocol
- // is internal to protobuf and is not guaranteed to be stable. Non-proto types
- // should not rely on this protocol.
--class PROTOBUF_EXPORT alignas(8) Arena final {
-+class PROTOBUF_EXPORT PROTOBUF_ALIGNAS(8) Arena final {
- public:
- // Arena constructor taking custom options. See ArenaOptions below for
- // descriptions of the options available.
-diff --git a/third_party/protobuf/src/google/protobuf/port_def.inc b/third_party/protobuf/src/google/protobuf/port_def.inc
-index f1bd85d..6d02b53 100644
---- a/third_party/protobuf/src/google/protobuf/port_def.inc
-+++ b/third_party/protobuf/src/google/protobuf/port_def.inc
-@@ -528,6 +528,35 @@ PROTOBUF_EXPORT_TEMPLATE_TEST(DEFAULT, __declspec(dllimport));
- #undef IN
- #endif // _MSC_VER
-
-+// Specify memory alignment for structs, classes, etc.
-+// Use like:
-+// class PROTOBUF_ALIGNAS(16) MyClass { ... }
-+// PROTOBUF_ALIGNAS(16) int array[4];
-+//
-+// In most places you can use the C++11 keyword "alignas", which is preferred.
-+//
-+// But compilers have trouble mixing __attribute__((...)) syntax with
-+// alignas(...) syntax.
-+//
-+// Doesn't work in clang or gcc:
-+// struct alignas(16) __attribute__((packed)) S { char c; };
-+// Works in clang but not gcc:
-+// struct __attribute__((packed)) alignas(16) S2 { char c; };
-+// Works in clang and gcc:
-+// struct alignas(16) S3 { char c; } __attribute__((packed));
-+//
-+// There are also some attributes that must be specified *before* a class
-+// definition: visibility (used for exporting functions/classes) is one of
-+// these attributes. This means that it is not possible to use alignas() with a
-+// class that is marked as exported.
-+#if defined(_MSC_VER)
-+#define PROTOBUF_ALIGNAS(byte_alignment) __declspec(align(byte_alignment))
-+#elif defined(__GNUC__)
-+#define PROTOBUF_ALIGNAS(byte_alignment) __attribute__((aligned(byte_alignment)))
-+#else
-+#define PROTOBUF_ALIGNAS(byte_alignment) alignas(byte_alignment)
-+#endif
-+
- #if defined(__clang__)
- #pragma clang diagnostic push
- // TODO(gerbens) ideally we cleanup the code. But a cursory try shows many
-diff --git a/third_party/protobuf/src/google/protobuf/port_undef.inc b/third_party/protobuf/src/google/protobuf/port_undef.inc
-index b7e67fe..ba1fffc 100644
---- a/third_party/protobuf/src/google/protobuf/port_undef.inc
-+++ b/third_party/protobuf/src/google/protobuf/port_undef.inc
-@@ -80,6 +80,7 @@
- #undef PROTOBUF_EXPORT_TEMPLATE_STYLE_MATCH_foj3FJo5StF0OvIzl7oMxA__declspec
- #undef PROTOBUF_EXPORT_TEMPLATE_STYLE_MATCH_DECLSPEC_dllexport
- #undef PROTOBUF_EXPORT_TEMPLATE_STYLE_MATCH_DECLSPEC_dllimport
-+#undef PROTOBUF_ALIGNAS
-
-
-
---
-2.26.2
-
diff --git a/chromium-79.0.3945.56-widevine-other-locations.patch b/chromium-79.0.3945.56-widevine-other-locations.patch
deleted file mode 100644
index 1f7bc58..0000000
--- a/chromium-79.0.3945.56-widevine-other-locations.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up chromium-92.0.4515.131/chrome/common/chrome_paths.cc.9~ chromium-92.0.4515.131/chrome/common/chrome_paths.cc
---- chromium-92.0.4515.131/chrome/common/chrome_paths.cc.9~ 2021-08-14 04:38:30.267041808 +0200
-+++ chromium-92.0.4515.131/chrome/common/chrome_paths.cc 2021-08-14 04:42:16.501598294 +0200
-@@ -313,6 +313,15 @@ bool PathProvider(int key, base::FilePat
-
- #if BUILDFLAG(ENABLE_WIDEVINE)
- case chrome::DIR_BUNDLED_WIDEVINE_CDM:
-+ base::PathService::Get(base::DIR_HOME, &cur);
-+ cur = cur.Append(FILE_PATH_LITERAL(".local/lib/libwidevinecdm.so"));
-+ if (base::PathExists(cur)) {
-+ break;
-+ }
-+ if (base::PathExists(base::FilePath(FILE_PATH_LITERAL("/opt/google/chrome/libwidevinecdm.so")))) {
-+ cur = base::FilePath(FILE_PATH_LITERAL("/opt/google/chrome/libwidevinecdm.so"));
-+ break;
-+ }
- if (!GetComponentDirectory(&cur))
- return false;
- #if !BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/chromium-80-QuicStreamSendBuffer-deleted-move-constructor.patch b/chromium-80-QuicStreamSendBuffer-deleted-move-constructor.patch
deleted file mode 100644
index aa3d541..0000000
--- a/chromium-80-QuicStreamSendBuffer-deleted-move-constructor.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 00f47df999c9b19e80fdc01db0ae9ca1b6a12b3a Mon Sep 17 00:00:00 2001
-From: vasilvv <vasilvv@google.com>
-Date: Wed, 03 Apr 2019 13:58:53 -0700
-Subject: [PATCH] GCC: do not delete move constructor of QuicStreamSendBuffer
-
-QuicStreamSendBuffer constructor is implicitely required in the
-initialization of the vector of substreams in QuicCryptoStream.
-Though clang apparently ignores that, GCC fails to build.
-
-BUG=chromium:819294
-
-Originally submitted by José Dapena Paz <jose.dapena@lge.com> at https://quiche-review.googlesource.com/c/quiche/+/2420
-
-PiperOrigin-RevId: 241800134
-Change-Id: I4e3c97d6e5895d85340e8c1b740e6196d9104066
----
-
-diff --git a/net/third_party/quiche/src/quic/core/quic_stream_send_buffer.h b/net/third_party/quiche/src/quic/core/quic_stream_send_buffer.h
-index e34514b..74e9d0d 100644
---- a/net/third_party/quiche/src/quic/core/quic_stream_send_buffer.h
-+++ b/net/third_party/quiche/src/quic/core/quic_stream_send_buffer.h
-@@ -62,7 +62,7 @@
- public:
- explicit QuicStreamSendBuffer(QuicBufferAllocator* allocator);
- QuicStreamSendBuffer(const QuicStreamSendBuffer& other) = delete;
-- QuicStreamSendBuffer(QuicStreamSendBuffer&& other) = delete;
-+ QuicStreamSendBuffer(QuicStreamSendBuffer&& other) = default;
- ~QuicStreamSendBuffer();
-
- // Save |data_length| of data starts at |iov_offset| in |iov| to send buffer.
diff --git a/chromium-81-extra-media.patch b/chromium-81-extra-media.patch
deleted file mode 100644
index b73043b..0000000
--- a/chromium-81-extra-media.patch
+++ /dev/null
@@ -1,366 +0,0 @@
-diff -up chromium-93.0.4577.42/media/base/audio_codecs.cc.27~ chromium-93.0.4577.42/media/base/audio_codecs.cc
---- chromium-93.0.4577.42/media/base/audio_codecs.cc.27~ 2021-08-12 21:10:18.000000000 +0200
-+++ chromium-93.0.4577.42/media/base/audio_codecs.cc 2021-08-15 05:51:57.694300788 +0200
-@@ -45,6 +45,10 @@ std::string GetCodecName(AudioCodec code
- return "ac3";
- case kCodecMpegHAudio:
- return "mpeg-h-audio";
-+ case kCodecMP2:
-+ return "mp2";
-+ case kCodecDTS:
-+ return "dts";
- }
- }
-
-@@ -80,6 +84,10 @@ AudioCodec StringToAudioCodec(const std:
- return kCodecVorbis;
- if (base::StartsWith(codec_id, "mp4a.40.", base::CompareCase::SENSITIVE))
- return kCodecAAC;
-+ if (codec_id == "mp2")
-+ return kCodecMP2;
-+ if (codec_id == "dts")
-+ return kCodecDTS;
- return kUnknownAudioCodec;
- }
-
-diff -up chromium-93.0.4577.42/media/base/audio_codecs.h.27~ chromium-93.0.4577.42/media/base/audio_codecs.h
---- chromium-93.0.4577.42/media/base/audio_codecs.h.27~ 2021-08-12 21:10:18.000000000 +0200
-+++ chromium-93.0.4577.42/media/base/audio_codecs.h 2021-08-15 05:51:57.696300776 +0200
-@@ -33,13 +33,15 @@ enum AudioCodec {
- kCodecALAC = 15,
- kCodecAC3 = 16,
- kCodecMpegHAudio = 17,
-+ kCodecMP2 = 18,
-+ kCodecDTS = 19,
- // DO NOT ADD RANDOM AUDIO CODECS!
- //
- // The only acceptable time to add a new codec is if there is production code
- // that uses said codec in the same CL.
-
- // Must always be equal to the largest entry ever logged.
-- kAudioCodecMax = kCodecMpegHAudio,
-+ kAudioCodecMax = kCodecDTS,
- };
-
- enum class AudioCodecProfile {
-diff -up chromium-93.0.4577.42/media/base/mime_util_internal.cc.27~ chromium-93.0.4577.42/media/base/mime_util_internal.cc
---- chromium-93.0.4577.42/media/base/mime_util_internal.cc.27~ 2021-08-12 21:10:18.000000000 +0200
-+++ chromium-93.0.4577.42/media/base/mime_util_internal.cc 2021-08-15 05:51:57.696300776 +0200
-@@ -91,6 +91,10 @@ const StringToCodecMap& GetStringToCodec
- {"vp8", MimeUtil::VP8},
- {"vp8.0", MimeUtil::VP8},
- {"theora", MimeUtil::THEORA},
-+ {"dts", MimeUtil::DTS},
-+ {"mp2", MimeUtil::MP2},
-+ {"mp4v.20.8", MimeUtil::MPEG4_SP},
-+ {"mp4v.20.240", MimeUtil::MPEG4_ASP},
- });
-
- return *kStringToCodecMap;
-@@ -187,6 +191,10 @@ AudioCodec MimeUtilToAudioCodec(MimeUtil
- return kCodecOpus;
- case MimeUtil::FLAC:
- return kCodecFLAC;
-+ case MimeUtil::DTS:
-+ return kCodecDTS;
-+ case MimeUtil::MP2:
-+ return kCodecMP2;
- default:
- break;
- }
-@@ -209,6 +217,9 @@ VideoCodec MimeUtilToVideoCodec(MimeUtil
- return kCodecTheora;
- case MimeUtil::DOLBY_VISION:
- return kCodecDolbyVision;
-+ case MimeUtil::MPEG4_SP:
-+ case MimeUtil::MPEG4_ASP:
-+ return kCodecMPEG4;
- default:
- break;
- }
-@@ -298,6 +309,33 @@ void MimeUtil::AddSupportedMediaFormats(
- CodecSet ogg_codecs(ogg_audio_codecs);
- ogg_codecs.insert(ogg_video_codecs.begin(), ogg_video_codecs.end());
-
-+ CodecSet matroska_audio_codecs;
-+ matroska_audio_codecs.emplace(OPUS);
-+ matroska_audio_codecs.emplace(VORBIS);
-+ matroska_audio_codecs.emplace(AC3);
-+ matroska_audio_codecs.emplace(EAC3);
-+ matroska_audio_codecs.emplace(DTS);
-+ matroska_audio_codecs.emplace(MP3);
-+ matroska_audio_codecs.emplace(MP2);
-+ matroska_audio_codecs.emplace(MPEG2_AAC);
-+ matroska_audio_codecs.emplace(MPEG4_AAC);
-+ matroska_audio_codecs.emplace(PCM);
-+ matroska_audio_codecs.emplace(FLAC);
-+
-+ CodecSet matroska_video_codecs;
-+ matroska_video_codecs.emplace(THEORA);
-+ matroska_video_codecs.emplace(VP8);
-+ matroska_video_codecs.emplace(VP9);
-+ matroska_video_codecs.emplace(H264);
-+ matroska_video_codecs.emplace(MPEG4_SP);
-+ matroska_video_codecs.emplace(MPEG4_ASP);
-+#if BUILDFLAG(ENABLE_AV1_DECODER)
-+ matroska_video_codecs.emplace(AV1);
-+#endif
-+ matroska_video_codecs.emplace(HEVC);
-+ CodecSet matroska_codecs(matroska_audio_codecs);
-+ matroska_codecs.insert(matroska_video_codecs.begin(), matroska_video_codecs.end());
-+
- const CodecSet webm_audio_codecs{OPUS, VORBIS};
- CodecSet webm_video_codecs{VP8, VP9};
- #if BUILDFLAG(ENABLE_AV1_DECODER)
-@@ -307,9 +345,9 @@ void MimeUtil::AddSupportedMediaFormats(
- CodecSet webm_codecs(webm_audio_codecs);
- webm_codecs.insert(webm_video_codecs.begin(), webm_video_codecs.end());
-
-- const CodecSet mp3_codecs{MP3};
-+ const CodecSet mp3_codecs{MP3, MP2};
-
-- CodecSet mp4_audio_codecs{FLAC, MP3, OPUS};
-+ CodecSet mp4_audio_codecs{FLAC, MP3, OPUS, MP2, DTS, AC3, EAC3};
-
- // Only VP9 with valid codec string vp09.xx.xx.xx.xx.xx.xx.xx is supported.
- // See ParseVp9CodecID for details.
-@@ -369,6 +407,10 @@ void MimeUtil::AddSupportedMediaFormats(
- DCHECK(!mp4_video_codecs.empty());
- AddContainerWithCodecs("video/mp4", mp4_codecs);
-
-+ AddContainerWithCodecs("audio/x-matroska", matroska_audio_codecs);
-+ AddContainerWithCodecs("video/x-matroska", matroska_codecs);
-+ AddContainerWithCodecs("video/x-msvideo", matroska_codecs);
-+
- #if BUILDFLAG(USE_PROPRIETARY_CODECS)
- AddContainerWithCodecs("audio/aac", implicit_codec); // AAC / ADTS.
- // These strings are supported for backwards compatibility only and thus only
-diff -up chromium-93.0.4577.42/media/base/mime_util_internal.h.27~ chromium-93.0.4577.42/media/base/mime_util_internal.h
---- chromium-93.0.4577.42/media/base/mime_util_internal.h.27~ 2021-08-12 21:10:18.000000000 +0200
-+++ chromium-93.0.4577.42/media/base/mime_util_internal.h 2021-08-15 05:51:57.696300776 +0200
-@@ -47,7 +47,11 @@ class MEDIA_EXPORT MimeUtil {
- DOLBY_VISION,
- AV1,
- MPEG_H_AUDIO,
-- LAST_CODEC = MPEG_H_AUDIO
-+ DTS,
-+ MP2,
-+ MPEG4_SP,
-+ MPEG4_ASP,
-+ LAST_CODEC = MPEG4_ASP
- };
-
- // Platform configuration structure. Controls which codecs are supported at
-diff -up chromium-93.0.4577.42/media/base/supported_types.cc.27~ chromium-93.0.4577.42/media/base/supported_types.cc
---- chromium-93.0.4577.42/media/base/supported_types.cc.27~ 2021-08-12 21:10:18.000000000 +0200
-+++ chromium-93.0.4577.42/media/base/supported_types.cc 2021-08-15 05:53:46.672645263 +0200
-@@ -209,6 +209,7 @@ bool IsAudioCodecProprietary(AudioCodec
- case kCodecAAC:
- case kCodecAC3:
- case kCodecEAC3:
-+ case kCodecDTS:
- case kCodecAMR_NB:
- case kCodecAMR_WB:
- case kCodecGSM_MS:
-@@ -217,6 +218,7 @@ bool IsAudioCodecProprietary(AudioCodec
- return true;
-
- case kCodecFLAC:
-+ case kCodecMP2:
- case kCodecMP3:
- case kCodecOpus:
- case kCodecVorbis:
-@@ -254,6 +256,7 @@ bool IsDefaultSupportedAudioType(const A
- #endif
-
- case kCodecFLAC:
-+ case kCodecMP2:
- case kCodecMP3:
- case kCodecOpus:
- case kCodecPCM:
-@@ -262,6 +265,10 @@ bool IsDefaultSupportedAudioType(const A
- case kCodecPCM_S24BE:
- case kCodecPCM_ALAW:
- case kCodecVorbis:
-+ case media::kCodecEAC3:
-+ case media::kCodecALAC:
-+ case media::kCodecAC3:
-+ case media::kCodecDTS:
- return true;
-
- case kCodecAMR_NB:
-@@ -273,9 +280,6 @@ bool IsDefaultSupportedAudioType(const A
- return false;
- #endif
-
-- case kCodecEAC3:
-- case kCodecALAC:
-- case kCodecAC3:
- case kCodecMpegHAudio:
- case kUnknownAudioCodec:
- return false;
-@@ -340,6 +344,10 @@ bool IsDefaultSupportedVideoType(const V
- case kCodecH264:
- case kCodecVP8:
- case kCodecTheora:
-+ case kCodecVC1:
-+ case kCodecMPEG2:
-+ case kCodecDolbyVision:
-+ case kCodecMPEG4:
- return true;
-
- case kCodecHEVC:
-@@ -350,17 +358,7 @@ bool IsDefaultSupportedVideoType(const V
- return false;
- #endif // BUILDFLAG(ENABLE_PLATFORM_ENCRYPTED_HEVC)
- case kUnknownVideoCodec:
-- case kCodecVC1:
-- case kCodecMPEG2:
-- case kCodecDolbyVision:
-- return false;
--
-- case kCodecMPEG4:
--#if BUILDFLAG(IS_CHROMEOS_ASH)
-- return true;
--#else
- return false;
--#endif
- }
-
- NOTREACHED();
-diff -up chromium-93.0.4577.42/media/ffmpeg/ffmpeg_common.cc.27~ chromium-93.0.4577.42/media/ffmpeg/ffmpeg_common.cc
---- chromium-93.0.4577.42/media/ffmpeg/ffmpeg_common.cc.27~ 2021-08-12 21:10:18.000000000 +0200
-+++ chromium-93.0.4577.42/media/ffmpeg/ffmpeg_common.cc 2021-08-15 05:51:57.696300776 +0200
-@@ -125,6 +125,10 @@ AudioCodec CodecIDToAudioCodec(AVCodecID
- case AV_CODEC_ID_MPEGH_3D_AUDIO:
- return kCodecMpegHAudio;
- #endif
-+ case AV_CODEC_ID_MP2:
-+ return kCodecMP2;
-+ case AV_CODEC_ID_DTS:
-+ return kCodecDTS;
- default:
- DVLOG(1) << "Unknown audio CodecID: " << codec_id;
- }
-@@ -180,6 +184,14 @@ AVCodecID AudioCodecToCodecID(AudioCodec
- case kCodecMpegHAudio:
- return AV_CODEC_ID_MPEGH_3D_AUDIO;
- #endif
-+ case kCodecAC3:
-+ return AV_CODEC_ID_AC3;
-+ case kCodecEAC3:
-+ return AV_CODEC_ID_EAC3;
-+ case kCodecMP2:
-+ return AV_CODEC_ID_MP2;
-+ case kCodecDTS:
-+ return AV_CODEC_ID_DTS;
- default:
- DVLOG(1) << "Unknown AudioCodec: " << audio_codec;
- }
-@@ -348,6 +360,7 @@ bool AVCodecContextToAudioDecoderConfig(
- codec_context->channels);
-
- int sample_rate = codec_context->sample_rate;
-+#if 0
- switch (codec) {
- // For AC3/EAC3 we enable only demuxing, but not decoding, so FFmpeg does
- // not fill |sample_fmt|.
-@@ -371,6 +384,7 @@ bool AVCodecContextToAudioDecoderConfig(
- default:
- break;
- }
-+#endif
-
- base::TimeDelta seek_preroll;
- if (codec_context->seek_preroll > 0) {
-diff -up chromium-93.0.4577.42/media/filters/ffmpeg_video_decoder.cc.27~ chromium-93.0.4577.42/media/filters/ffmpeg_video_decoder.cc
---- chromium-93.0.4577.42/media/filters/ffmpeg_video_decoder.cc.27~ 2021-08-12 21:10:18.000000000 +0200
-+++ chromium-93.0.4577.42/media/filters/ffmpeg_video_decoder.cc 2021-08-15 05:51:57.696300776 +0200
-@@ -40,7 +40,6 @@ static int GetFFmpegVideoDecoderThreadCo
- case kUnknownVideoCodec:
- case kCodecVC1:
- case kCodecMPEG2:
-- case kCodecHEVC:
- case kCodecVP9:
- case kCodecAV1:
- case kCodecDolbyVision:
-@@ -54,6 +53,7 @@ static int GetFFmpegVideoDecoderThreadCo
-
- case kCodecH264:
- case kCodecVP8:
-+ case kCodecHEVC:
- // Normalize to three threads for 1080p content, then scale linearly
- // with number of pixels.
- // Examples:
-diff -up chromium-93.0.4577.42/media/remoting/proto_enum_utils.cc.27~ chromium-93.0.4577.42/media/remoting/proto_enum_utils.cc
---- chromium-93.0.4577.42/media/remoting/proto_enum_utils.cc.27~ 2021-08-12 21:10:18.000000000 +0200
-+++ chromium-93.0.4577.42/media/remoting/proto_enum_utils.cc 2021-08-15 05:51:57.697300770 +0200
-@@ -34,6 +34,8 @@ absl::optional<AudioCodec> ToMediaAudioC
- CASE_RETURN_OTHER(kCodecALAC);
- CASE_RETURN_OTHER(kCodecAC3);
- CASE_RETURN_OTHER(kCodecMpegHAudio);
-+ CASE_RETURN_OTHER(kCodecMP2);
-+ CASE_RETURN_OTHER(kCodecDTS);
- }
- return absl::nullopt; // Not a 'default' to ensure compile-time checks.
- }
-@@ -61,6 +63,8 @@ ToProtoAudioDecoderConfigCodec(AudioCode
- CASE_RETURN_OTHER(kCodecALAC);
- CASE_RETURN_OTHER(kCodecAC3);
- CASE_RETURN_OTHER(kCodecMpegHAudio);
-+ CASE_RETURN_OTHER(kCodecMP2);
-+ CASE_RETURN_OTHER(kCodecDTS);
- }
- return absl::nullopt; // Not a 'default' to ensure compile-time checks.
- }
-diff -up chromium-93.0.4577.42/net/base/mime_util.cc.27~ chromium-93.0.4577.42/net/base/mime_util.cc
---- chromium-93.0.4577.42/net/base/mime_util.cc.27~ 2021-08-12 21:10:19.000000000 +0200
-+++ chromium-93.0.4577.42/net/base/mime_util.cc 2021-08-15 05:51:57.697300770 +0200
-@@ -167,6 +167,9 @@ static const MimeInfo kPrimaryMappings[]
- {"image/png", "png"},
- {"image/apng", "png"},
- {"image/webp", "webp"},
-+ {"video/x-matroska", "mkv"},
-+ {"audio/x-matroska", "mkv"},
-+ {"video/x-msvideo", "avi"},
- {"multipart/related", "mht,mhtml"},
- {"text/css", "css"},
- {"text/html", "html,htm,shtml,shtm"},
-@@ -686,6 +689,7 @@ static const char* const kStandardAudioT
- "audio/vorbis",
- "audio/wav",
- "audio/webm",
-+ "audio/x-matroska",
- "audio/x-m4a",
- "audio/x-ms-wma",
- "audio/vnd.rn-realaudio",
-@@ -708,8 +712,10 @@ static const char* const kStandardVideoT
- "video/webm",
- "video/x-dv",
- "video/x-m4v",
-+ "video/x-matroska",
- "video/x-mpeg",
- "video/x-ms-asf",
-+ "video/x-msvideo",
- "video/x-ms-wmv"
- };
-
-diff -up chromium-93.0.4577.42/third_party/openscreen/src/cast/streaming/remoting.proto.27~ chromium-93.0.4577.42/third_party/openscreen/src/cast/streaming/remoting.proto
---- chromium-93.0.4577.42/third_party/openscreen/src/cast/streaming/remoting.proto.27~ 2021-08-12 21:18:11.000000000 +0200
-+++ chromium-93.0.4577.42/third_party/openscreen/src/cast/streaming/remoting.proto 2021-08-15 05:51:57.697300770 +0200
-@@ -60,6 +60,8 @@ message AudioDecoderConfig {
- kCodecALAC = 15;
- kCodecAC3 = 16;
- kCodecMpegHAudio = 17;
-+ kCodecMP2 = 18;
-+ kCodecDTS = 19;
- }
-
- // Proto version of Chrome's media::SampleFormat.
-@@ -451,4 +453,4 @@ message RpcMessage {
- // RPC_DS_READUNTIL_CALLBACK
- DemuxerStreamReadUntilCallback demuxerstream_readuntilcb_rpc = 401;
- };
--}
-\ No newline at end of file
-+}
diff --git a/chromium-83-disable-fontconfig-cache-magic.patch b/chromium-83-disable-fontconfig-cache-magic.patch
deleted file mode 100644
index 926d309..0000000
--- a/chromium-83-disable-fontconfig-cache-magic.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up chromium-92.0.4515.131/base/test/BUILD.gn.7~ chromium-92.0.4515.131/base/test/BUILD.gn
---- chromium-92.0.4515.131/base/test/BUILD.gn.7~ 2021-08-14 04:23:28.113072347 +0200
-+++ chromium-92.0.4515.131/base/test/BUILD.gn 2021-08-14 04:37:15.215239352 +0200
-@@ -198,9 +198,6 @@ static_library("test_support") {
- sources += [ "test_file_util_linux.cc" ]
- public_deps += [ ":fontconfig_util_linux" ]
- data_deps += [ "//third_party/test_fonts" ]
-- if (current_toolchain == host_toolchain) {
-- data_deps += [ ":do_generate_fontconfig_caches" ]
-- }
- }
-
- if (is_mac) {
diff --git a/chromium-84-blink-disable-clang-format.patch b/chromium-84-blink-disable-clang-format.patch
deleted file mode 100644
index 2cf46d1..0000000
--- a/chromium-84-blink-disable-clang-format.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up chromium-90.0.4412.3/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py.21~ chromium-90.0.4412.3/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py
---- chromium-90.0.4412.3/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py.21~ 2021-02-12 16:44:13.129616051 +0100
-+++ chromium-90.0.4412.3/third_party/blink/renderer/bindings/scripts/bind_gen/codegen_utils.py 2021-02-12 16:46:34.313837863 +0100
-@@ -171,13 +171,4 @@ def write_code_node_to_file(code_node, f
-
- rendered_text = render_code_node(code_node)
-
-- format_result = style_format.auto_format(rendered_text, filename=filepath)
-- if not format_result.did_succeed:
-- raise RuntimeError("Style-formatting failed: filename = {filename}\n"
-- "---- stderr ----\n"
-- "{stderr}:".format(
-- filename=format_result.filename,
-- stderr=format_result.error_message))
--
-- web_idl.file_io.write_to_file_if_changed(
-- filepath, format_result.contents.encode('utf-8'))
-+ web_idl.file_io.write_to_file_if_changed(filepath, rendered_text)
diff --git a/chromium-86-ImageMemoryBarrierData-init.patch b/chromium-86-ImageMemoryBarrierData-init.patch
deleted file mode 100644
index f8dcc6b..0000000
--- a/chromium-86-ImageMemoryBarrierData-init.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up chromium-92.0.4515.131/third_party/angle/src/libANGLE/renderer/vulkan/vk_helpers.cpp.13~ chromium-92.0.4515.131/third_party/angle/src/libANGLE/renderer/vulkan/vk_helpers.cpp
---- chromium-92.0.4515.131/third_party/angle/src/libANGLE/renderer/vulkan/vk_helpers.cpp.13~ 2021-08-14 04:47:19.872202958 +0200
-+++ chromium-92.0.4515.131/third_party/angle/src/libANGLE/renderer/vulkan/vk_helpers.cpp 2021-08-14 04:49:04.563673410 +0200
-@@ -76,7 +76,7 @@ constexpr size_t kDefaultPoolAllocatorPa
-
- struct ImageMemoryBarrierData
- {
-- char name[44];
-+ const char *name;
-
- // The Vk layout corresponding to the ImageLayout key.
- VkImageLayout layout;
diff --git a/chromium-86-nearby-explicit.patch b/chromium-86-nearby-explicit.patch
deleted file mode 100644
index b8a86e4..0000000
--- a/chromium-86-nearby-explicit.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 849e5c6b3a8746d9205102bd3df4e140cead405a Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Sat, 18 Jul 2020 15:11:13 +0000
-Subject: [PATCH] GCC: remove explicit from AtomicReference constructor
-
----
- .../nearby/src/cpp/platform/public/atomic_reference.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/third_party/nearby/src/cpp/platform/public/atomic_reference.h b/third_party/nearby/src/cpp/platform/public/atomic_reference.h
-index 5742724..bbb8c01 100644
---- a/third_party/nearby/src/cpp/platform/public/atomic_reference.h
-+++ b/third_party/nearby/src/cpp/platform/public/atomic_reference.h
-@@ -37,7 +37,7 @@ class AtomicReference<T, std::enable_if_t<sizeof(T) <= sizeof(std::uint32_t) &&
- final {
- public:
- using Platform = api::ImplementationPlatform;
-- explicit AtomicReference(T value)
-+ AtomicReference(T value)
- : impl_(Platform::CreateAtomicUint32(static_cast<std::uint32_t>(value))) {
- }
- ~AtomicReference() = default;
---
-2.26.2
-
diff --git a/chromium-86-nearby-include.patch b/chromium-86-nearby-include.patch
deleted file mode 100644
index 75b11b6..0000000
--- a/chromium-86-nearby-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up chromium-88.0.4324.150/third_party/nearby/src/cpp/platform/base/byte_array.h.21~ chromium-88.0.4324.150/third_party/nearby/src/cpp/platform/base/byte_array.h
---- chromium-88.0.4324.150/third_party/nearby/src/cpp/platform/base/byte_array.h.21~ 2021-02-11 22:10:53.276561385 +0100
-+++ chromium-88.0.4324.150/third_party/nearby/src/cpp/platform/base/byte_array.h 2021-02-11 22:11:44.036118419 +0100
-@@ -18,6 +18,7 @@
- #include <algorithm>
- #include <array>
- #include <cstdint>
-+#include <cstring>
- #include <string>
- #include <type_traits>
- #include <utility>
diff --git a/chromium-87-CursorFactory-include.patch b/chromium-87-CursorFactory-include.patch
deleted file mode 100644
index 98cb9cf..0000000
--- a/chromium-87-CursorFactory-include.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From c4f6e8cd34a245c3640b86a91c9694d69594d80b Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Wed, 16 Sep 2020 15:05:02 +0000
-Subject: [PATCH] IWYU: ui::CursorFactory is now required independent from
- Ozone
-
----
- .../ui/views/chrome_browser_main_extra_parts_views_linux.cc | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
-index 5a97d61..ccedd2a 100644
---- a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
-+++ b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
-@@ -7,6 +7,7 @@
- #include "chrome/browser/themes/theme_service_aura_linux.h"
- #include "chrome/browser/ui/browser_list.h"
- #include "chrome/browser/ui/views/theme_profile_key.h"
-+#include "ui/base/cursor/cursor_factory.h"
- #include "ui/display/screen.h"
- #include "ui/views/linux_ui/linux_ui.h"
-
-@@ -15,10 +16,6 @@
- #include "ui/gtk/gtk_ui_delegate.h"
- #endif
-
--#if defined(USE_OZONE)
--#include "ui/base/cursor/cursor_factory.h"
--#endif
--
- #if defined(USE_X11)
- #include "ui/gfx/x/connection.h" // nogncheck
- #if BUILDFLAG(USE_GTK)
---
-2.26.2
-
diff --git a/chromium-87-compiler.patch b/chromium-87-compiler.patch
deleted file mode 100644
index dd3cabe..0000000
--- a/chromium-87-compiler.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-diff -up chromium-93.0.4577.42/build/config/compiler/BUILD.gn.14~ chromium-93.0.4577.42/build/config/compiler/BUILD.gn
---- chromium-93.0.4577.42/build/config/compiler/BUILD.gn.14~ 2021-08-12 21:10:06.000000000 +0200
-+++ chromium-93.0.4577.42/build/config/compiler/BUILD.gn 2021-08-14 04:54:59.478262479 +0200
-@@ -291,8 +291,6 @@ config("compiler") {
-
- configs += [
- # See the definitions below.
-- ":clang_revision",
-- ":compiler_cpu_abi",
- ":compiler_codegen",
- ":compiler_deterministic",
- ]
-@@ -530,24 +528,6 @@ config("compiler") {
- ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
- }
-
-- if (is_clang && !is_nacl && !use_xcode_clang) {
-- cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
--
-- # TODO(hans): Remove this once Clang generates better optimized debug info
-- # by default. https://crbug.com/765793
-- cflags += [
-- "-mllvm",
-- "-instcombine-lower-dbg-declare=0",
-- ]
-- if (!is_debug && use_thin_lto && is_a_target_toolchain) {
-- if (is_win) {
-- ldflags += [ "-mllvm:-instcombine-lower-dbg-declare=0" ]
-- } else {
-- ldflags += [ "-Wl,-mllvm,-instcombine-lower-dbg-declare=0" ]
-- }
-- }
-- }
--
- # C11/C++11 compiler flags setup.
- # ---------------------------
- if (is_linux || is_chromeos || is_android || (is_nacl && is_clang) ||
-@@ -1653,7 +1633,7 @@ config("chromium_code") {
- defines = [ "_HAS_NODISCARD" ]
- }
- } else {
-- cflags = [ "-Wall" ]
-+ cflags = []
- if (treat_warnings_as_errors) {
- cflags += [ "-Werror" ]
-
-@@ -1662,10 +1642,6 @@ config("chromium_code") {
- # well.
- ldflags = [ "-Werror" ]
- }
-- if (is_clang) {
-- # Enable extra warnings for chromium_code when we control the compiler.
-- cflags += [ "-Wextra" ]
-- }
-
- # In Chromium code, we define __STDC_foo_MACROS in order to get the
- # C99 macros on Mac and Linux.
-@@ -1674,15 +1650,6 @@ config("chromium_code") {
- "__STDC_FORMAT_MACROS",
- ]
-
-- if (!is_debug && !using_sanitizer && current_cpu != "s390x" &&
-- current_cpu != "s390" && current_cpu != "ppc64" &&
-- current_cpu != "mips" && current_cpu != "mips64") {
-- # Non-chromium code is not guaranteed to compile cleanly with
-- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are
-- # disabled, so only do that for Release build.
-- defines += [ "_FORTIFY_SOURCE=2" ]
-- }
--
- if (is_mac) {
- cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
- cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]
-@@ -2094,7 +2061,8 @@ config("default_stack_frames") {
- }
-
- # Default "optimization on" config.
--config("optimize") {
-+config("optimize") { }
-+config("xoptimize") {
- if (is_win) {
- if (chrome_pgo_phase != 2) {
- # Favor size over speed, /O1 must be before the common flags.
-@@ -2129,7 +2097,8 @@ config("optimize") {
- }
-
- # Turn off optimizations.
--config("no_optimize") {
-+config("no_optimize") { }
-+config("xno_optimize") {
- if (is_win) {
- cflags = [
- "/Od", # Disable optimization.
-@@ -2169,7 +2138,8 @@ config("no_optimize") {
- # Turns up the optimization level. On Windows, this implies whole program
- # optimization and link-time code generation which is very expensive and should
- # be used sparingly.
--config("optimize_max") {
-+config("optimize_max") { }
-+config("xoptimize_max") {
- if (is_nacl && is_nacl_irt) {
- # The NaCl IRT is a special case and always wants its own config.
- # Various components do:
-@@ -2201,7 +2171,8 @@ config("optimize_max") {
- #
- # TODO(crbug.com/621335) - rework how all of these configs are related
- # so that we don't need this disclaimer.
--config("optimize_speed") {
-+config("optimize_speed") { }
-+config("xoptimize_speed") {
- if (is_nacl && is_nacl_irt) {
- # The NaCl IRT is a special case and always wants its own config.
- # Various components do:
-@@ -2226,7 +2197,8 @@ config("optimize_speed") {
- }
- }
-
--config("optimize_fuzzing") {
-+config("optimize_fuzzing") { }
-+config("xoptimize_fuzzing") {
- cflags = [ "-O1" ] + common_optimize_on_cflags
- ldflags = common_optimize_on_ldflags
- visibility = [ ":default_optimization" ]
-@@ -2345,7 +2317,8 @@ config("win_pdbaltpath") {
- }
-
- # Full symbols.
--config("symbols") {
-+config("symbols") { }
-+config("xsymbols") {
- if (is_win) {
- if (is_clang) {
- cflags = [ "/Z7" ] # Debug information in the .obj files.
-@@ -2440,7 +2413,8 @@ config("symbols") {
- # Minimal symbols.
- # This config guarantees to hold symbol for stack trace which are shown to user
- # when crash happens in unittests running on buildbot.
--config("minimal_symbols") {
-+config("minimal_symbols") { }
-+config("xminimal_symbols") {
- if (is_win) {
- # Functions, files, and line tables only.
- cflags = []
-@@ -2505,7 +2479,8 @@ config("minimal_symbols") {
- # This configuration contains function names only. That is, the compiler is
- # told to not generate debug information and the linker then just puts function
- # names in the final debug information.
--config("no_symbols") {
-+config("no_symbols") { }
-+config("xno_symbols") {
- if (is_win) {
- ldflags = [ "/DEBUG" ]
-
diff --git a/chromium-87-openscreen-include.patch b/chromium-87-openscreen-include.patch
deleted file mode 100644
index 42545a8..0000000
--- a/chromium-87-openscreen-include.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0c0af4cabb7490db473cd2c28f069956974a4d98 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Fri, 2 Oct 2020 12:11:58 +0000
-Subject: [PATCH] IWYU: uint8_t is defined in stdint.h
-
----
- third_party/openscreen/src/util/crypto/random_bytes.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/third_party/openscreen/src/util/crypto/random_bytes.h b/third_party/openscreen/src/util/crypto/random_bytes.h
-index 3cb2fa8..025b52c 100644
---- a/third_party/openscreen/src/util/crypto/random_bytes.h
-+++ b/third_party/openscreen/src/util/crypto/random_bytes.h
-@@ -7,6 +7,8 @@
-
- #include <array>
-
-+#include <stdint.h>
-+
- namespace openscreen {
-
- std::array<uint8_t, 16> GenerateRandomBytes16();
---
-2.26.2
-
diff --git a/chromium-88-buildfixes.patch b/chromium-88-buildfixes.patch
deleted file mode 100644
index 8495a92..0000000
--- a/chromium-88-buildfixes.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -up chromium-88.0.4324.150/cc/metrics/compositor_frame_reporter.cc.omv~ chromium-88.0.4324.150/cc/metrics/compositor_frame_reporter.cc
---- chromium-88.0.4324.150/cc/metrics/compositor_frame_reporter.cc.omv~ 2021-02-11 22:52:55.382518694 +0100
-+++ chromium-88.0.4324.150/cc/metrics/compositor_frame_reporter.cc 2021-02-11 22:53:06.205667772 +0100
-@@ -671,7 +671,7 @@ void CompositorFrameReporter::ReportComp
-
- void CompositorFrameReporter::ReportEventLatencyHistograms() const {
- for (const auto& event_metrics : events_metrics_) {
-- DCHECK_NE(event_metrics, nullptr);
-+// DCHECK_NE(event_metrics, nullptr);
- const std::string histogram_base_name =
- GetEventLatencyHistogramBaseName(*event_metrics);
- const int event_type_index = static_cast<int>(event_metrics->type());
-diff -up chromium-88.0.4324.150/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc.omv~ chromium-88.0.4324.150/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
---- chromium-88.0.4324.150/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc.omv~ 2021-02-11 23:19:59.162753094 +0100
-+++ chromium-88.0.4324.150/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc 2021-02-11 23:20:08.452730989 +0100
-@@ -432,7 +432,7 @@ String TextCodecICU::Decode(const char*
- // ICU decodes it as U+E5E5.
- if (!strcmp(encoding_.GetName(), "GBK")) {
- if (EqualIgnoringASCIICase(encoding_.GetName(), "gb18030"))
-- resultString.Replace(0xE5E5, ideographicSpaceCharacter);
-+ resultString.Replace(0xE5E5, kIdeographicSpaceCharacter);
- // Make GBK compliant to the encoding spec and align with GB18030
- resultString.Replace(0x01F9, 0xE7C8);
- // FIXME: Once https://www.w3.org/Bugs/Public/show_bug.cgi?id=28740#c3
-diff -up chromium-88.0.4324.150/ui/accessibility/platform/inspect/tree_formatter.h.omv~ chromium-88.0.4324.150/ui/accessibility/platform/inspect/tree_formatter.h
---- chromium-88.0.4324.150/ui/accessibility/platform/inspect/tree_formatter.h.omv~ 2021-02-11 23:48:46.084819798 +0100
-+++ chromium-88.0.4324.150/ui/accessibility/platform/inspect/tree_formatter.h 2021-02-11 23:48:52.363879771 +0100
-@@ -9,6 +9,9 @@
-
- #include "ui/gfx/native_widget_types.h"
-
-+#include <vector>
-+#include <memory>
-+
- namespace base {
- class Value;
- class DictionaryValue;
diff --git a/chromium-88-less-blacklist-nonsense.patch b/chromium-88-less-blacklist-nonsense.patch
index a3adddd..1c89e5d 100644
--- a/chromium-88-less-blacklist-nonsense.patch
+++ b/chromium-88-less-blacklist-nonsense.patch
@@ -100,7 +100,7 @@ diff -up chromium-92.0.4515.131/gpu/config/gpu_driver_bug_list.json.32~ chromium
- {
"id": 132,
"description": "On Intel GPUs MSAA performance is not acceptable for GPU rasterization",
- "cr_bugs": [527565],
+ "cr_bugs": [527565, 1298585],
@@ -1036,27 +971,6 @@
"disabled_extensions": ["GL_NV_path_rendering"]
},
diff --git a/chromium-89-buildfixes.patch b/chromium-89-buildfixes.patch
deleted file mode 100644
index 52ae70e..0000000
--- a/chromium-89-buildfixes.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up chromium-89.0.4389.47/net/third_party/quiche/src/quic/core/quic_path_validator.cc.omv~ chromium-89.0.4389.47/net/third_party/quiche/src/quic/core/quic_path_validator.cc
---- chromium-89.0.4389.47/net/third_party/quiche/src/quic/core/quic_path_validator.cc.omv~ 2021-02-12 14:30:35.072615942 +0100
-+++ chromium-89.0.4389.47/net/third_party/quiche/src/quic/core/quic_path_validator.cc 2021-02-12 14:30:38.863587716 +0100
-@@ -68,7 +68,7 @@ void QuicPathValidator::OnPathResponse(c
- void QuicPathValidator::StartPathValidation(
- std::unique_ptr<QuicPathValidationContext> context,
- std::unique_ptr<ResultDelegate> result_delegate) {
-- DCHECK_NE(nullptr, context);
-+ //DCHECK_NE(nullptr, context);
- QUIC_DLOG(INFO) << "Start validating path " << *context
- << " via writer: " << context->WriterToUse();
- if (path_context_ != nullptr) {
diff --git a/chromium-90-compilefixes.patch b/chromium-90-compilefixes.patch
deleted file mode 100644
index 1073324..0000000
--- a/chromium-90-compilefixes.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -up chromium-95.0.4638.17/components/viz/service/display/direct_renderer.h.23~ chromium-95.0.4638.17/components/viz/service/display/direct_renderer.h
---- chromium-95.0.4638.17/components/viz/service/display/direct_renderer.h.23~ 2021-09-21 21:04:39.000000000 +0200
-+++ chromium-95.0.4638.17/components/viz/service/display/direct_renderer.h 2021-09-25 02:12:50.383819876 +0200
-@@ -14,6 +14,7 @@
- #include "base/containers/flat_map.h"
- #include "base/macros.h"
- #include "build/build_config.h"
-+#include "components/viz/service/display/delegated_ink_trail_data.h"
- #include "components/viz/common/quads/aggregated_render_pass.h"
- #include "components/viz/common/quads/tile_draw_quad.h"
- #include "components/viz/service/display/aggregated_frame.h"
-diff -up chromium-95.0.4638.17/components/viz/service/display/gl_renderer.h.23~ chromium-95.0.4638.17/components/viz/service/display/gl_renderer.h
---- chromium-95.0.4638.17/components/viz/service/display/gl_renderer.h.23~ 2021-09-21 21:04:39.000000000 +0200
-+++ chromium-95.0.4638.17/components/viz/service/display/gl_renderer.h 2021-09-25 02:12:50.383819876 +0200
-@@ -17,6 +17,7 @@
- #include "base/containers/queue.h"
- #include "base/macros.h"
- #include "build/build_config.h"
-+#include "components/viz/service/display/delegated_ink_trail_data.h"
- #include "components/viz/common/gpu/context_cache_controller.h"
- #include "components/viz/common/quads/aggregated_render_pass_draw_quad.h"
- #include "components/viz/common/quads/compositor_render_pass_draw_quad.h"
-diff -up chromium-95.0.4638.17/third_party/pdfium/core/fxcodec/png/png_decoder.cpp.23~ chromium-95.0.4638.17/third_party/pdfium/core/fxcodec/png/png_decoder.cpp
---- chromium-95.0.4638.17/third_party/pdfium/core/fxcodec/png/png_decoder.cpp.23~ 2021-09-25 02:12:50.383819876 +0200
-+++ chromium-95.0.4638.17/third_party/pdfium/core/fxcodec/png/png_decoder.cpp 2021-09-25 02:14:11.918065584 +0200
-@@ -4,6 +4,7 @@
-
- // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-+#include "core/fxcodec/fx_codec_def.h"
- #include "core/fxcodec/png/png_decoder.h"
-
- #include <setjmp.h>
-diff -up chromium-95.0.4638.17/third_party/ruy/src/ruy/block_map.cc.23~ chromium-95.0.4638.17/third_party/ruy/src/ruy/block_map.cc
-diff -up chromium-95.0.4638.17/third_party/zlib/google/zip_internal.cc.23~ chromium-95.0.4638.17/third_party/zlib/google/zip_internal.cc
---- chromium-95.0.4638.17/third_party/zlib/google/zip_internal.cc.23~ 2021-09-21 21:05:32.000000000 +0200
-+++ chromium-95.0.4638.17/third_party/zlib/google/zip_internal.cc 2021-09-25 02:12:50.384819880 +0200
-@@ -18,9 +18,11 @@
- #include "base/strings/utf_string_conversions.h"
-
- #if defined(USE_SYSTEM_MINIZIP)
-+#include <zlib.h>
- #include <minizip/ioapi.h>
- #include <minizip/unzip.h>
- #include <minizip/zip.h>
-+typedef unsigned long uLong;
- #else
- #include "third_party/zlib/contrib/minizip/unzip.h"
- #include "third_party/zlib/contrib/minizip/zip.h"
diff --git a/chromium-92-fix-bogus-assert.patch b/chromium-92-fix-bogus-assert.patch
deleted file mode 100644
index 7b1b7fb..0000000
--- a/chromium-92-fix-bogus-assert.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up chromium-92.0.4515.131/third_party/closure_compiler/compiler.py.omv~ chromium-92.0.4515.131/third_party/closure_compiler/compiler.py
---- chromium-92.0.4515.131/third_party/closure_compiler/compiler.py.omv~ 2021-08-14 17:52:34.534896646 +0200
-+++ chromium-92.0.4515.131/third_party/closure_compiler/compiler.py 2021-08-14 17:52:51.942728670 +0200
-@@ -14,7 +14,7 @@ import subprocess
-
- _CURRENT_DIR = os.path.join(os.path.dirname(__file__))
--_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java")
--assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
-+_JAVA_PATH = "/usr/bin/java"
-+#assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds"
-
- class Compiler(object):
- """Runs the Closure compiler on given source files to typecheck them
diff --git a/chromium-92-skia-freetype-2.11.patch b/chromium-92-skia-freetype-2.11.patch
deleted file mode 100644
index f715f7a..0000000
--- a/chromium-92-skia-freetype-2.11.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -up chromium-92.0.4515.159/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp.omv~ chromium-92.0.4515.159/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp
---- chromium-92.0.4515.159/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp.omv~ 2021-08-23 02:13:31.798273578 +0200
-+++ chromium-92.0.4515.159/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp 2021-08-23 02:13:54.013339915 +0200
-@@ -712,7 +712,7 @@ void colrv1_draw_paint(SkCanvas* canvas,
- canvas->drawPaint(colrPaint);
- break;
- }
-- case FT_COLR_PAINTFORMAT_TRANSFORMED:
-+ case FT_COLR_PAINTFORMAT_TRANSFORM:
- case FT_COLR_PAINTFORMAT_TRANSLATE:
- case FT_COLR_PAINTFORMAT_ROTATE:
- case FT_COLR_PAINTFORMAT_SKEW:
-@@ -759,8 +759,8 @@ void colrv1_transform(SkCanvas* canvas,
- SkMatrix transform;
-
- switch (colrv1_paint.format) {
-- case FT_COLR_PAINTFORMAT_TRANSFORMED: {
-- transform = ToSkMatrix(colrv1_paint.u.transformed.affine);
-+ case FT_COLR_PAINTFORMAT_TRANSFORM: {
-+ transform = ToSkMatrix(colrv1_paint.u.transform.affine);
- break;
- }
- case FT_COLR_PAINTFORMAT_TRANSLATE: {
-@@ -880,10 +880,10 @@ bool colrv1_traverse_paint(SkCanvas* can
- traverse_result = colrv1_start_glyph(canvas, palette, face, paint.u.colr_glyph.glyphID,
- FT_COLOR_NO_ROOT_TRANSFORM);
- break;
-- case FT_COLR_PAINTFORMAT_TRANSFORMED:
-+ case FT_COLR_PAINTFORMAT_TRANSFORM:
- colrv1_transform(canvas, face, paint);
- traverse_result = colrv1_traverse_paint(canvas, palette, face,
-- paint.u.transformed.paint, visited_set);
-+ paint.u.transform.paint, visited_set);
- break;
- case FT_COLR_PAINTFORMAT_TRANSLATE:
- colrv1_transform(canvas, face, paint);
diff --git a/chromium-93-buildfix.patch b/chromium-93-buildfix.patch
deleted file mode 100644
index d04467a..0000000
--- a/chromium-93-buildfix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up chromium-93.0.4577.42/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.omv~ chromium-93.0.4577.42/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
---- chromium-93.0.4577.42/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.omv~ 2021-08-15 06:12:02.482288779 +0200
-+++ chromium-93.0.4577.42/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc 2021-08-15 06:12:12.753222019 +0200
-@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() {
- // SIGSTKSZ may be too small to prevent the signal handlers from overrunning
- // the alternative stack. Ensure that the size of the alternative stack is
- // large enough.
-- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
-+ static const unsigned kSigStackSize = std::max<unsigned>(16384, SIGSTKSZ);
-
- // Only set an alternative stack if there isn't already one, or if the current
- // one is too small.
diff --git a/chromium-93-ffmpeg-4.4.patch b/chromium-93-ffmpeg-4.4.patch
deleted file mode 100644
index f0ec736..0000000
--- a/chromium-93-ffmpeg-4.4.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
-index ac4713b07268..492a9a37d096 100644
---- a/media/filters/ffmpeg_demuxer.cc
-+++ b/media/filters/ffmpeg_demuxer.cc
-@@ -427,11 +427,11 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
- scoped_refptr<DecoderBuffer> buffer;
-
- if (type() == DemuxerStream::TEXT) {
-- size_t id_size = 0;
-+ int id_size = 0;
- uint8_t* id_data = av_packet_get_side_data(
- packet.get(), AV_PKT_DATA_WEBVTT_IDENTIFIER, &id_size);
-
-- size_t settings_size = 0;
-+ int settings_size = 0;
- uint8_t* settings_data = av_packet_get_side_data(
- packet.get(), AV_PKT_DATA_WEBVTT_SETTINGS, &settings_size);
-
-@@ -443,7 +443,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
- buffer = DecoderBuffer::CopyFrom(packet->data, packet->size,
- side_data.data(), side_data.size());
- } else {
-- size_t side_data_size = 0;
-+ int side_data_size = 0;
- uint8_t* side_data = av_packet_get_side_data(
- packet.get(), AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, &side_data_size);
-
-@@ -504,7 +504,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
- packet->size - data_offset);
- }
-
-- size_t skip_samples_size = 0;
-+ int skip_samples_size = 0;
- const uint32_t* skip_samples_ptr =
- reinterpret_cast<const uint32_t*>(av_packet_get_side_data(
- packet.get(), AV_PKT_DATA_SKIP_SAMPLES, &skip_samples_size));
diff --git a/chromium-94-compiler.patch b/chromium-94-compiler.patch
deleted file mode 100644
index de6552f..0000000
--- a/chromium-94-compiler.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up chromium-94.0.4606.54/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.omv~ chromium-94.0.4606.54/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
---- chromium-94.0.4606.54/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.omv~ 2021-09-24 03:11:36.816288059 +0200
-+++ chromium-94.0.4606.54/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc 2021-09-24 03:13:32.361015096 +0200
-@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() {
- // SIGSTKSZ may be too small to prevent the signal handlers from overrunning
- // the alternative stack. Ensure that the size of the alternative stack is
- // large enough.
-- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
-+ static const unsigned kSigStackSize = (SIGSTKSZ>16384)?SIGSTKSZ:16384;
-
- // Only set an alternative stack if there isn't already one, or if the current
- // one is too small.
diff --git a/chromium-94-glibc-2.34.patch b/chromium-94-glibc-2.34.patch
deleted file mode 100644
index ae25628..0000000
--- a/chromium-94-glibc-2.34.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up chromium-95.0.4638.17/sandbox/linux/services/credentials.cc.28~ chromium-95.0.4638.17/sandbox/linux/services/credentials.cc
---- chromium-95.0.4638.17/sandbox/linux/services/credentials.cc.28~ 2021-09-21 21:04:46.000000000 +0200
-+++ chromium-95.0.4638.17/sandbox/linux/services/credentials.cc 2021-09-25 16:23:01.646102987 +0200
-@@ -100,7 +100,8 @@ bool ChrootToSafeEmptyDir() {
- // TODO(crbug.com/1247458) Broken in MSan builds after LLVM f1bb30a4956f.
- clone_flags |= CLONE_VM | CLONE_VFORK | CLONE_SETTLS;
-
-- char tls_buf[PTHREAD_STACK_MIN] = {0};
-+ char *tls_buf = new char[PTHREAD_STACK_MIN];
-+ memset(tls_buf, 0, PTHREAD_STACK_MIN);
- tls = tls_buf;
- #endif
-
-@@ -111,6 +112,10 @@ bool ChrootToSafeEmptyDir() {
- int status = -1;
- PCHECK(HANDLE_EINTR(waitpid(pid, &status, 0)) == pid);
-
-+#if (defined(ARCH_CPU_X86_64) || defined(ARCH_CPU_ARM_FAMILY)) && \
-+ !defined(MEMORY_SANITIZER)
-+ delete[] tls_buf;
-+#endif
- return WIFEXITED(status) && WEXITSTATUS(status) == kExitSuccess;
- }
-
diff --git a/chromium-97-compilefixes.patch b/chromium-97-compilefixes.patch
index bcd381b..a0b8ddc 100644
--- a/chromium-97-compilefixes.patch
+++ b/chromium-97-compilefixes.patch
@@ -1,15 +1,3 @@
-diff -up chromium-97.0.4682.3/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.omv~ chromium-97.0.4682.3/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
---- chromium-97.0.4682.3/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.omv~ 2021-11-02 22:45:17.238262908 +0100
-+++ chromium-97.0.4682.3/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc 2021-11-02 22:45:23.061268462 +0100
-@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() {
- // SIGSTKSZ may be too small to prevent the signal handlers from overrunning
- // the alternative stack. Ensure that the size of the alternative stack is
- // large enough.
-- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ);
-+ static const unsigned kSigStackSize = std::max(16384L, SIGSTKSZ);
-
- // Only set an alternative stack if there isn't already one, or if the current
- // one is too small.
diff -up chromium-97.0.4682.3/third_party/zlib/google/zip_internal.cc.omv~ chromium-97.0.4682.3/third_party/zlib/google/zip_internal.cc
--- chromium-97.0.4682.3/third_party/zlib/google/zip_internal.cc.omv~ 2021-11-02 22:51:01.799596700 +0100
+++ chromium-97.0.4682.3/third_party/zlib/google/zip_internal.cc 2021-11-02 22:52:16.428670047 +0100
@@ -58,24 +46,3 @@ diff -up chromium-97.0.4682.3/third_party/zlib/google/zip_internal.cc.omv~ chrom
/*password=*/nullptr,
/*crcForCrypting=*/0,
/*versionMadeBy=*/0,
-diff -up chromium-97.0.4682.3/sandbox/linux/services/credentials.cc.omv~ chromium-97.0.4682.3/sandbox/linux/services/credentials.cc
---- chromium-97.0.4682.3/sandbox/linux/services/credentials.cc.omv~ 2021-11-03 00:53:43.137064606 +0100
-+++ chromium-97.0.4682.3/sandbox/linux/services/credentials.cc 2021-11-03 00:54:48.494608066 +0100
-@@ -100,7 +100,8 @@ bool ChrootToSafeEmptyDir() {
- // TODO(crbug.com/1247458) Broken in MSan builds after LLVM f1bb30a4956f.
- clone_flags |= CLONE_VM | CLONE_VFORK | CLONE_SETTLS;
-
-- char tls_buf[PTHREAD_STACK_MIN] = {0};
-+ char *tls_buf = new char[PTHREAD_STACK_MIN];
-+ *tls_buf = 0;
- tls = tls_buf;
- #endif
-
-@@ -111,6 +112,7 @@ bool ChrootToSafeEmptyDir() {
- int status = -1;
- PCHECK(HANDLE_EINTR(waitpid(pid, &status, 0)) == pid);
-
-+ delete[] tls_buf;
- return WIFEXITED(status) && WEXITSTATUS(status) == kExitSuccess;
- }
-
diff --git a/chromium-96-EnumTable-crash.patch b/chromium-98.0.4758.80-EnumTable-crash.patch
similarity index 79%
rename from chromium-96-EnumTable-crash.patch
rename to chromium-98.0.4758.80-EnumTable-crash.patch
index 9736739..68459ba 100644
--- a/chromium-96-EnumTable-crash.patch
+++ b/chromium-98.0.4758.80-EnumTable-crash.patch
@@ -1,7 +1,6 @@
-diff --git a/components/cast_channel/enum_table.h b/components/cast_channel/enum_table.h
-index aad9e08..2f3fcad 100644
---- a/components/cast_channel/enum_table.h
-+++ b/components/cast_channel/enum_table.h
+diff -up chromium-98.0.4758.80/components/cast_channel/enum_table.h.EnumTable-crash chromium-98.0.4758.80/components/cast_channel/enum_table.h
+--- chromium-98.0.4758.80/components/cast_channel/enum_table.h.EnumTable-crash 2022-02-01 00:41:47.000000000 +0000
++++ chromium-98.0.4758.80/components/cast_channel/enum_table.h 2022-02-02 18:54:23.096214186 +0000
@@ -8,6 +8,7 @@
#include <cstdint>
#include <cstring>
@@ -9,8 +8,8 @@ index aad9e08..2f3fcad 100644
+#include <vector>
#include "base/check_op.h"
- #include "base/macros.h"
-@@ -188,7 +189,6 @@ class
+ #include "base/notreached.h"
+@@ -187,7 +188,6 @@ class
inline constexpr GenericEnumTableEntry(int32_t value);
inline constexpr GenericEnumTableEntry(int32_t value, base::StringPiece str);
@@ -18,7 +17,7 @@ index aad9e08..2f3fcad 100644
GenericEnumTableEntry& operator=(const GenericEnumTableEntry&) = delete;
private:
-@@ -254,7 +254,6 @@ class EnumTable {
+@@ -253,7 +253,6 @@ class EnumTable {
constexpr Entry(E value, base::StringPiece str)
: GenericEnumTableEntry(static_cast<int32_t>(value), str) {}
@@ -26,7 +25,7 @@ index aad9e08..2f3fcad 100644
Entry& operator=(const Entry&) = delete;
};
-@@ -313,15 +312,14 @@ class EnumTable {
+@@ -312,15 +311,14 @@ class EnumTable {
if (is_sorted_) {
const std::size_t index = static_cast<std::size_t>(value);
if (ANALYZER_ASSUME_TRUE(index < data_.size())) {
@@ -44,7 +43,7 @@ index aad9e08..2f3fcad 100644
}
// This overload of GetString is designed for cases where the argument is a
-@@ -349,8 +347,7 @@ class EnumTable {
+@@ -348,8 +346,7 @@ class EnumTable {
// enum value directly.
absl::optional<E> GetEnum(base::StringPiece str) const {
auto* entry = GenericEnumTableEntry::FindByString(
@@ -54,7 +53,7 @@ index aad9e08..2f3fcad 100644
return entry ? static_cast<E>(entry->value) : absl::optional<E>();
}
-@@ -365,7 +362,7 @@ class EnumTable {
+@@ -364,7 +361,7 @@ class EnumTable {
// Align the data on a cache line boundary.
alignas(64)
#endif
@@ -63,7 +62,7 @@ index aad9e08..2f3fcad 100644
bool is_sorted_;
constexpr EnumTable(std::initializer_list<Entry> data, bool is_sorted)
-@@ -377,8 +374,8 @@ class EnumTable {
+@@ -376,8 +373,8 @@ class EnumTable {
for (std::size_t i = 0; i < data.size(); i++) {
for (std::size_t j = i + 1; j < data.size(); j++) {
diff --git a/chromium-99.0.4844.84-markdownsafe-soft_str.patch b/chromium-99.0.4844.84-markdownsafe-soft_str.patch
new file mode 100644
index 0000000..f84c401
--- /dev/null
+++ b/chromium-99.0.4844.84-markdownsafe-soft_str.patch
@@ -0,0 +1,148 @@
+diff -up chromium-99.0.4844.84/third_party/jinja2/filters.py.soft_str chromium-99.0.4844.84/third_party/jinja2/filters.py
+--- chromium-99.0.4844.84/third_party/jinja2/filters.py.soft_str 2022-03-28 10:33:14.979405438 -0400
++++ chromium-99.0.4844.84/third_party/jinja2/filters.py 2022-03-28 10:33:45.934597164 -0400
+@@ -10,7 +10,7 @@ from itertools import groupby
+
+ from markupsafe import escape
+ from markupsafe import Markup
+-from markupsafe import soft_unicode
++from markupsafe import soft_str
+
+ from ._compat import abc
+ from ._compat import imap
+@@ -191,18 +191,18 @@ def do_replace(eval_ctx, s, old, new, co
+ ):
+ s = escape(s)
+ else:
+- s = soft_unicode(s)
+- return s.replace(soft_unicode(old), soft_unicode(new), count)
++ s = soft_str(s)
++ return s.replace(soft_str(old), soft_str(new), count)
+
+
+ def do_upper(s):
+ """Convert a value to uppercase."""
+- return soft_unicode(s).upper()
++ return soft_str(s).upper()
+
+
+ def do_lower(s):
+ """Convert a value to lowercase."""
+- return soft_unicode(s).lower()
++ return soft_str(s).lower()
+
+
+ @evalcontextfilter
+@@ -245,7 +245,7 @@ def do_capitalize(s):
+ """Capitalize a value. The first character will be uppercase, all others
+ lowercase.
+ """
+- return soft_unicode(s).capitalize()
++ return soft_str(s).capitalize()
+
+
+ def do_title(s):
+@@ -255,7 +255,7 @@ def do_title(s):
+ return "".join(
+ [
+ item[0].upper() + item[1:].lower()
+- for item in _word_beginning_split_re.split(soft_unicode(s))
++ for item in _word_beginning_split_re.split(soft_str(s))
+ if item
+ ]
+ )
+@@ -495,7 +495,7 @@ def do_join(eval_ctx, value, d=u"", attr
+ return d.join(value)
+
+ # no html involved, to normal joining
+- return soft_unicode(d).join(imap(soft_unicode, value))
++ return soft_str(d).join(imap(soft_str, value))
+
+
+ def do_center(value, width=80):
+@@ -761,7 +761,7 @@ def do_wordwrap(
+
+ def do_wordcount(s):
+ """Count the words in that string."""
+- return len(_word_re.findall(soft_unicode(s)))
++ return len(_word_re.findall(soft_str(s)))
+
+
+ def do_int(value, default=0, base=10):
+@@ -820,12 +820,12 @@ def do_format(value, *args, **kwargs):
+ raise FilterArgumentError(
+ "can't handle positional and keyword arguments at the same time"
+ )
+- return soft_unicode(value) % (kwargs or args)
++ return soft_str(value) % (kwargs or args)
+
+
+ def do_trim(value, chars=None):
+ """Strip leading and trailing characters, by default whitespace."""
+- return soft_unicode(value).strip(chars)
++ return soft_str(value).strip(chars)
+
+
+ def do_striptags(value):
+@@ -1365,7 +1365,7 @@ FILTERS = {
+ "selectattr": do_selectattr,
+ "slice": do_slice,
+ "sort": do_sort,
+- "string": soft_unicode,
++ "string": soft_str,
+ "striptags": do_striptags,
+ "sum": do_sum,
+ "title": do_title,
+diff -up chromium-99.0.4844.84/third_party/jinja2/runtime.py.soft_str chromium-99.0.4844.84/third_party/jinja2/runtime.py
+--- chromium-99.0.4844.84/third_party/jinja2/runtime.py.soft_str 2022-03-28 10:36:17.301534689 -0400
++++ chromium-99.0.4844.84/third_party/jinja2/runtime.py 2022-03-28 10:36:33.053632253 -0400
+@@ -6,7 +6,7 @@ from types import MethodType
+
+ from markupsafe import escape # noqa: F401
+ from markupsafe import Markup
+-from markupsafe import soft_unicode
++from markupsafe import soft_str
+
+ from ._compat import abc
+ from ._compat import imap
+@@ -62,7 +62,7 @@ def identity(x):
+ def markup_join(seq):
+ """Concatenation that escapes if necessary and converts to unicode."""
+ buf = []
+- iterator = imap(soft_unicode, seq)
++ iterator = imap(soft_str, seq)
+ for arg in iterator:
+ buf.append(arg)
+ if hasattr(arg, "__html__"):
+diff -up chromium-99.0.4844.84/third_party/jinja2/utils.py.soft_str chromium-99.0.4844.84/third_party/jinja2/utils.py
+--- chromium-99.0.4844.84/third_party/jinja2/utils.py.soft_str 2022-03-28 10:34:29.063864294 -0400
++++ chromium-99.0.4844.84/third_party/jinja2/utils.py 2022-03-28 10:35:31.555251349 -0400
+@@ -725,13 +725,13 @@ except SyntaxError:
+ have_async_gen = False
+
+
+-def soft_unicode(s):
+- from markupsafe import soft_unicode
++def soft_str(s):
++ from markupsafe import soft_str
+
+ warnings.warn(
+- "'jinja2.utils.soft_unicode' will be removed in version 3.0."
+- " Use 'markupsafe.soft_unicode' instead.",
++ "'jinja2.utils.soft_str' will be removed in version 3.0."
++ " Use 'markupsafe.soft_str' instead.",
+ DeprecationWarning,
+ stacklevel=2,
+ )
+- return soft_unicode(s)
++ return soft_str(s)
+--- chromium-102.0.5005.61/third_party/blink/renderer/bindings/scripts/generate_bindings.pydeps.orig 2022-06-04 09:03:43.846883491 +0100
++++ chromium-102.0.5005.61/third_party/blink/renderer/bindings/scripts/generate_bindings.pydeps 2022-06-04 09:03:54.599516645 +0100
+@@ -17,7 +17,6 @@
+ ../../../../mako/mako/template.py
+ ../../../../mako/mako/util.py
+ ../../../../markupsafe/__init__.py
+-../../../../markupsafe/_compat.py
+ ../../../../markupsafe/_native.py
+ ../../../../pyjson5/src/json5/__init__.py
+ ../../../../pyjson5/src/json5/lib.py
diff --git a/chromium-browser-stable.spec b/chromium-browser-stable.spec
index 1043c15..1ae09ee 100644
--- a/chromium-browser-stable.spec
+++ b/chromium-browser-stable.spec
@@ -78,7 +78,7 @@
Name: chromium-browser-%{channel}
# Working version numbers can be found at
# http://omahaproxy.appspot.com/
-Version: 97.0.4692.99
+Version: 102.0.5005.61
Release: 1%{?extrarelsuffix}
Summary: A fast webkit-based web browser
Group: Networking/WWW
@@ -107,7 +107,7 @@ Patch6: https://src.fedoraproject.org/rpms/chromium/raw/master/f/chromium-77.0.
# https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/chromium-widevine-r3.patch
Patch8: https://src.fedoraproject.org/rpms/chromium/raw/master/f/chromium-71.0.3578.98-widevine-r3.patch
# Try to load widevine from other places
-Patch11: https://src.fedoraproject.org/rpms/chromium/raw/master/f/chromium-79.0.3945.56-widevine-other-locations.patch
+Patch11: https://src.fedoraproject.org/rpms/chromium/raw/master/f/chromium-100.0.4896.60-widevine-other-locations.patch
# Add "Fedora" to the user agent string
#Patch13: https://src.fedoraproject.org/rpms/chromium/raw/master/f/chromium-79.0.3945.56-fedora-user-agent.patch
# https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/chromium-unbundle-zlib.patch
@@ -117,13 +117,20 @@ Patch54: https://src.fedoraproject.org/rpms/chromium/raw/master/f/chromium-77.0.
# /../../ui/base/cursor/ozone/bitmap_cursor_factory_ozone.cc:53:15: error: 'find_if' is not a member of 'std'; did you mean 'find'?
#Patch63: https://src.fedoraproject.org/rpms/chromium/raw/master/f/chromium-79.0.3945.56-fix-find_if.patch
+Patch64: https://src.fedoraproject.org/rpms/chromium/raw/master/f/chromium-98.0.4758.80-EnumTable-crash.patch
+
+%if %omvver > 4050000
+# only cooker has markupsafe > 2.0
+Patch65: https://src.fedoraproject.org/rpms/chromium/raw/rawhide/f/chromium-99.0.4844.84-markdownsafe-soft_str.patch
+%endif
+
# From Arch and Gentoo
# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=chromium-dev
-Patch100: https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-96-EnumTable-crash.patch
Patch101: https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-93-InkDropHost-crash.patch
Patch102: https://raw.githubusercontent.com/gentoo/gentoo/master/www-client/chromium/files/chromium-shim_headers.patch
Patch103: https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/chromium/trunk/use-oauth2-client-switches-as-default.patch
-
+Patch104: https://github.com/archlinux/svntogit-packages/raw/packages/chromium/trunk/chromium-libxml-unbundle.patch
+Patch105: reverse-roll-src-third_party-ffmpeg.patch
# Use lstdc++ on EPEL7 only
#Patch101: https://src.fedoraproject.org/rpms/chromium/raw/master/f/chromium-75.0.3770.100-epel7-stdc++.patch
@@ -137,30 +144,27 @@ Patch103: https://raw.githubusercontent.com/archlinux/svntogit-packages/packages
### Chromium gcc/libstdc++ support ###
# https://github.com/stha09/chromium-patches
-Source500: https://github.com/stha09/chromium-patches/releases/download/chromium-97-patchset-4/chromium-97-patchset-4.tar.xz
+Source500: https://github.com/stha09/chromium-patches/releases/download/chromium-102-patchset-6/chromium-102-patchset-6.tar.xz
### Chromium Tests Patches ###
# Arch Linux, fix for compile error with system ICU
-Patch602: https://raw.githubusercontent.com/archlinuxarm/PKGBUILDs/master/extra/chromium/chromium-system-icu.patch
# Enable VAAPI support on Linux
# FIXME reenable once the patchset has caught up with upstream
# https://github.com/saiarcot895/chromium-ubuntu-build
-# Fixes from Arch
-Patch661: https://aur.archlinux.org/cgit/aur.git/plain/wayland-egl.patch
-
# omv
Patch1001: chromium-64-system-curl.patch
Patch1003: chromium-system-zlib.patch
Patch1004: chromium-88-less-blacklist-nonsense.patch
-Patch1007: chromium-81-enable-gpu-features.patch
+#Patch1007: chromium-81-enable-gpu-features.patch
Patch2: https://src.fedoraproject.org/rpms/chromium/raw/master/f/chromium-67.0.3396.62-gn-system.patch
Patch1002: chromium-69-no-static-libstdc++.patch
Patch1006: https://raw.githubusercontent.com/ungoogled-software/ungoogled-chromium-fedora/master/chromium-91.0.4472.77-java-only-allowed-in-android-builds.patch
Patch1009: chromium-97-compilefixes.patch
Patch1010: chromium-97-ffmpeg-4.4.1.patch
Patch1011: chromium-99-ffmpeg-5.0.patch
+Patch1012: chromium-102-python3.11.patch
Provides: %{crname}
Obsoletes: chromium-browser-unstable < 26.0.1410.51
@@ -170,6 +174,7 @@ BuildRequires: gperf
BuildRequires: bison
BuildRequires: re2c
BuildRequires: flex
+BuildRequires: git
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(krb5)
BuildRequires: pkgconfig(openh264)
@@ -242,6 +247,7 @@ BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(minizip)
%endif
BuildRequires: pkgconfig(protobuf)
+BuildRequires: python3dist(protobuf)
BuildRequires: yasm
BuildRequires: pkgconfig(libusb-1.0)
BuildRequires: speech-dispatcher-devel
@@ -352,7 +358,7 @@ fi
%ifarch %{arm}
# Use linker flags to reduce memory consumption on low-mem architectures
-%global optflags %(echo %{optflags} | sed -e 's/-g /-g0 /' -e 's/-gdwarf-4//')
+%global optflags %(echo %{optflags} | sed -e 's/-g3 /-g0 /' -e 's/-gdwarf-4//')
mkdir -p bfd
ln -s %{_bindir}/ld.bfd bfd/ld
export PATH=$PWD/bfd:$PATH
@@ -363,12 +369,13 @@ export PATH=$PWD/bfd:$PATH
# Workaround for build failure
%global ldflags %{ldflags} -Wl,-z,notext
%endif
+%global optflags %(echo %{optflags} | sed -e 's/-g3 /-g0 /' -e 's/-gdwarf-4//')
%global optflags %{optflags} -I%{_includedir}/libunwind
export CC=clang
export CXX=clang++
-CHROMIUM_CORE_GN_DEFINES="use_sysroot=false is_debug=false fieldtrial_testing_like_official_build=true use_lld=false use_gold=true"
+CHROMIUM_CORE_GN_DEFINES="use_sysroot=false is_debug=false fieldtrial_testing_like_official_build=true "
CHROMIUM_CORE_GN_DEFINES+=" is_clang=true clang_base_path=\"%{_prefix}\" clang_use_chrome_plugins=false "
CHROMIUM_CORE_GN_DEFINES+=" treat_warnings_as_errors=false "
CHROMIUM_CORE_GN_DEFINES+=" use_custom_libcxx=true "
@@ -405,7 +412,6 @@ CHROMIUM_CORE_GN_DEFINES+=" use_ozone=true "
CHROMIUM_CORE_GN_DEFINES+=" enable_nacl=false "
CHROMIUM_CORE_GN_DEFINES+=" proprietary_codecs=true "
CHROMIUM_CORE_GN_DEFINES+=" ffmpeg_branding=\"ChromeOS\" "
-CHROMIUM_CORE_GN_DEFINES+=" enable_hevc_demuxing=true "
CHROMIUM_CORE_GN_DEFINES+=" enable_mse_mpeg2ts_stream_parser=true "
%ifarch %{ix86}
CHROMIUM_CORE_GN_DEFINES+=" target_cpu=\"x86\""
@@ -428,6 +434,7 @@ CHROMIUM_CORE_GN_DEFINES+=" thin_lto_enable_optimizations=true use_clang=true us
CHROMIUM_CORE_GN_DEFINES+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
CHROMIUM_CORE_GN_DEFINES+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
CHROMIUM_CORE_GN_DEFINES+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:default\""
+CHROMIUM_CORE_GN_DEFINES+=" symbol_level=1"
CHROMIUM_BROWSER_GN_DEFINES="use_pulseaudio=true link_pulseaudio=true"
CHROMIUM_BROWSER_GN_DEFINES+=" enable_nacl=false"
diff --git a/chromium-fix-char_traits.patch b/chromium-fix-char_traits.patch
deleted file mode 100644
index 4cb9503..0000000
--- a/chromium-fix-char_traits.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/base/strings/char_traits.h
-+++ b/base/strings/char_traits.h
-@@ -67,9 +67,9 @@
- return __builtin_memcmp(s1, s2, n);
- #else
- for (; n; --n, ++s1, ++s2) {
-- if (*s1 < *s2)
-+ if ((unsigned char)*s1 < (unsigned char)*s2)
- return -1;
-- if (*s1 > *s2)
-+ if ((unsigned char)*s1 > (unsigned char)*s2)
- return 1;
- }
- return 0;
diff --git a/chromium-glibc-2.33.patch b/chromium-glibc-2.33.patch
deleted file mode 100644
index cc4bd69..0000000
--- a/chromium-glibc-2.33.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-diff -up chromium-90.0.4430.61/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.29~ chromium-90.0.4430.61/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
---- chromium-90.0.4430.61/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.29~ 2021-04-11 02:14:54.133079077 +0200
-+++ chromium-90.0.4430.61/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc 2021-04-11 02:15:50.639505244 +0200
-@@ -269,6 +269,18 @@ ResultExpr EvaluateSyscallImpl(int fs_de
- return Allow();
- }
-
-+#if defined(__NR_newfstatat)
-+ if (sysno == __NR_newfstatat) {
-+ return RewriteFstatatSIGSYS();
-+ }
-+#endif
-+
-+#if defined(__NR_fstatat64)
-+ if (sysno == __NR_fstatat64) {
-+ return RewriteFstatatSIGSYS();
-+ }
-+#endif
-+
- if (SyscallSets::IsFileSystem(sysno) ||
- SyscallSets::IsCurrentDirectory(sysno)) {
- return Error(fs_denied_errno);
-diff -up chromium-90.0.4430.61/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc.29~ chromium-90.0.4430.61/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
---- chromium-90.0.4430.61/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc.29~ 2021-04-07 23:04:41.000000000 +0200
-+++ chromium-90.0.4430.61/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc 2021-04-11 02:14:54.133079077 +0200
-@@ -6,6 +6,8 @@
-
- #include "sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h"
-
-+#include <errno.h>
-+#include <fcntl.h>
- #include <stddef.h>
- #include <stdint.h>
- #include <string.h>
-@@ -355,6 +357,35 @@ intptr_t SIGSYSSchedHandler(const struct
- return -ENOSYS;
- }
-
-+intptr_t SIGSYSFstatatHandler(const struct arch_seccomp_data& args,
-+ void* aux) {
-+ switch (args.nr) {
-+#if defined(__NR_newfstatat)
-+ case __NR_newfstatat:
-+#endif
-+#if defined(__NR_fstatat64)
-+ case __NR_fstatat64:
-+#endif
-+#if defined(__NR_newfstatat) || defined(__NR_fstatat64)
-+ if (*reinterpret_cast<const char *>(args.args[1]) == '\0'
-+ && args.args[3] == static_cast<uint64_t>(AT_EMPTY_PATH)) {
-+ return sandbox::sys_fstat64(static_cast<int>(args.args[0]),
-+ reinterpret_cast<struct stat64 *>(args.args[2]));
-+ } else {
-+ errno = EACCES;
-+ return -1;
-+ }
-+ break;
-+#endif
-+ }
-+
-+ CrashSIGSYS_Handler(args, aux);
-+
-+ // Should never be reached.
-+ RAW_CHECK(false);
-+ return -ENOSYS;
-+}
-+
- bpf_dsl::ResultExpr CrashSIGSYS() {
- return bpf_dsl::Trap(CrashSIGSYS_Handler, NULL);
- }
-@@ -387,6 +418,10 @@ bpf_dsl::ResultExpr RewriteSchedSIGSYS()
- return bpf_dsl::Trap(SIGSYSSchedHandler, NULL);
- }
-
-+bpf_dsl::ResultExpr RewriteFstatatSIGSYS() {
-+ return bpf_dsl::Trap(SIGSYSFstatatHandler, NULL);
-+}
-+
- void AllocateCrashKeys() {
- #if !defined(OS_NACL_NONSFI)
- if (seccomp_crash_key)
-diff -up chromium-90.0.4430.61/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h.29~ chromium-90.0.4430.61/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h
---- chromium-90.0.4430.61/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h.29~ 2021-04-07 23:04:41.000000000 +0200
-+++ chromium-90.0.4430.61/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h 2021-04-11 02:14:54.133079077 +0200
-@@ -62,6 +62,10 @@ SANDBOX_EXPORT intptr_t SIGSYSPtraceFail
- // sched_setparam(), sched_setscheduler()
- SANDBOX_EXPORT intptr_t SIGSYSSchedHandler(const arch_seccomp_data& args,
- void* aux);
-+// If the fstatat syscall is actually a disguised fstat, calls the regular fstat
-+// syscall, otherwise, crashes in the same way as CrashSIGSYS_Handler.
-+SANDBOX_EXPORT intptr_t SIGSYSFstatatHandler(const struct arch_seccomp_data& args,
-+ void* aux);
-
- // Variants of the above functions for use with bpf_dsl.
- SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYS();
-@@ -72,6 +76,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Crash
- SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYSFutex();
- SANDBOX_EXPORT bpf_dsl::ResultExpr CrashSIGSYSPtrace();
- SANDBOX_EXPORT bpf_dsl::ResultExpr RewriteSchedSIGSYS();
-+SANDBOX_EXPORT bpf_dsl::ResultExpr RewriteFstatatSIGSYS();
-
- // Allocates a crash key so that Seccomp information can be recorded.
- void AllocateCrashKeys();
-diff -up chromium-90.0.4430.61/sandbox/linux/services/syscall_wrappers.cc.29~ chromium-90.0.4430.61/sandbox/linux/services/syscall_wrappers.cc
---- chromium-90.0.4430.61/sandbox/linux/services/syscall_wrappers.cc.29~ 2021-04-07 23:04:41.000000000 +0200
-+++ chromium-90.0.4430.61/sandbox/linux/services/syscall_wrappers.cc 2021-04-11 02:14:54.133079077 +0200
-@@ -261,4 +261,13 @@ int sys_sigaction(int signum,
-
- #endif // defined(MEMORY_SANITIZER)
-
-+SANDBOX_EXPORT int sys_fstat64(int fd, struct stat64 *buf)
-+{
-+#if defined(__NR_fstat64)
-+ return syscall(__NR_fstat64, fd, buf);
-+#else
-+ return syscall(__NR_fstat, fd, buf);
-+#endif
-+}
-+
- } // namespace sandbox
-diff -up chromium-90.0.4430.61/sandbox/linux/services/syscall_wrappers.h.29~ chromium-90.0.4430.61/sandbox/linux/services/syscall_wrappers.h
---- chromium-90.0.4430.61/sandbox/linux/services/syscall_wrappers.h.29~ 2021-04-07 23:04:41.000000000 +0200
-+++ chromium-90.0.4430.61/sandbox/linux/services/syscall_wrappers.h 2021-04-11 02:14:54.133079077 +0200
-@@ -17,6 +17,7 @@ struct sock_fprog;
- struct rlimit64;
- struct cap_hdr;
- struct cap_data;
-+struct stat64;
-
- namespace sandbox {
-
-@@ -84,6 +85,9 @@ SANDBOX_EXPORT int sys_sigaction(int sig
- const struct sigaction* act,
- struct sigaction* oldact);
-
-+// Recent glibc rewrites fstat to fstatat.
-+SANDBOX_EXPORT int sys_fstat64(int fd, struct stat64 *buf);
-+
- } // namespace sandbox
-
- #endif // SANDBOX_LINUX_SERVICES_SYSCALL_WRAPPERS_H_
diff --git a/chromium-libxml-unbundle.patch b/chromium-libxml-unbundle.patch
new file mode 100644
index 0000000..5699bc8
--- /dev/null
+++ b/chromium-libxml-unbundle.patch
@@ -0,0 +1,10 @@
+--- a/build/linux/unbundle/libxml.gn
++++ b/build/linux/unbundle/libxml.gn
+@@ -19,6 +19,7 @@ static_library("libxml_utils") {
+ ":xml_reader",
+ ":xml_writer",
+ "//base/test:test_support",
++ "//services/data_decoder:lib",
+ "//services/data_decoder:xml_parser_fuzzer_deps",
+ ]
+ sources = [
diff --git a/chromium-skia-harmony.patch b/chromium-skia-harmony.patch
deleted file mode 100644
index ecd491e..0000000
--- a/chromium-skia-harmony.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- cr/third_party/skia/src/ports/SkFontHost_FreeType.cpp.orig 2019-07-19 11:08:34.770972665 +0000
-+++ cr/third_party/skia/src/ports/SkFontHost_FreeType.cpp 2019-07-19 11:08:44.274442065 +0000
-@@ -128,9 +128,9 @@ public:
- : fGetVarDesignCoordinates(nullptr)
- , fGetVarAxisFlags(nullptr)
- , fLibrary(nullptr)
-- , fIsLCDSupported(false)
-+ , fIsLCDSupported(true)
- , fLightHintingIsYOnly(false)
-- , fLCDExtra(0)
-+ , fLCDExtra(2)
- {
- if (FT_New_Library(&gFTMemory, &fLibrary)) {
- return;
diff --git a/chromium-system-icu.patch b/chromium-system-icu.patch
deleted file mode 100644
index e63d92a..0000000
--- a/chromium-system-icu.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -up chromium-92.0.4515.131/base/BUILD.gn.21~ chromium-92.0.4515.131/base/BUILD.gn
---- chromium-92.0.4515.131/base/BUILD.gn.21~ 2021-08-14 04:50:54.077202236 +0200
-+++ chromium-92.0.4515.131/base/BUILD.gn 2021-08-14 04:52:08.212268230 +0200
-@@ -3469,7 +3469,7 @@ test("base_unittests") {
- ]
- }
-
-- if (icu_use_data_file) {
-+ if (false) {
- if (is_android) {
- deps += [ "//third_party/icu:icu_extra_assets" ]
- } else {
-diff -up chromium-92.0.4515.131/third_party/blink/renderer/platform/text/character_property_data.h.21~ chromium-92.0.4515.131/third_party/blink/renderer/platform/text/character_property_data.h
---- chromium-92.0.4515.131/third_party/blink/renderer/platform/text/character_property_data.h.21~ 2021-08-03 04:50:29.000000000 +0200
-+++ chromium-92.0.4515.131/third_party/blink/renderer/platform/text/character_property_data.h 2021-08-14 04:50:54.077202236 +0200
-@@ -161,10 +161,12 @@ static const UChar32 kIsHangulRanges[] =
- 0xD7B0, 0xD7FF,
- // Halfwidth Hangul Jamo
- // https://www.unicode.org/charts/nameslist/c_FF00.html
-- 0xFFA0, 0xFFDC,
-+ 0xFFA0, 0xFFDB,
- };
-
--static const UChar32 kIsHangulArray[] = {};
-+static const UChar32 kIsHangulArray[] = {
-+ 0xFFDC,
-+};
-
- // Freezed trie tree, see character_property_data_generator.cc.
- extern const int32_t kSerializedCharacterDataSize;
diff --git a/reverse-roll-src-third_party-ffmpeg.patch b/reverse-roll-src-third_party-ffmpeg.patch
new file mode 100644
index 0000000..c78848e
--- /dev/null
+++ b/reverse-roll-src-third_party-ffmpeg.patch
@@ -0,0 +1,287 @@
+--- b/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc
++++ a/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc
+@@ -74,7 +74,7 @@
+ codec_context->sample_fmt = AV_SAMPLE_FMT_NONE;
+ }
+
++ codec_context->channels = config.channel_count;
+- codec_context->ch_layout.nb_channels = config.channel_count;
+ codec_context->sample_rate = config.samples_per_second;
+
+ if (config.extra_data) {
+@@ -124,8 +124,8 @@
+ case cdm::kAudioFormatPlanarS16:
+ case cdm::kAudioFormatPlanarF32: {
+ const int decoded_size_per_channel =
++ decoded_audio_size / av_frame.channels;
++ for (int i = 0; i < av_frame.channels; ++i) {
+- decoded_audio_size / av_frame.ch_layout.nb_channels;
+- for (int i = 0; i < av_frame.ch_layout.nb_channels; ++i) {
+ memcpy(output_buffer, av_frame.extended_data[i],
+ decoded_size_per_channel);
+ output_buffer += decoded_size_per_channel;
+@@ -185,14 +185,13 @@
+ // Success!
+ decoding_loop_ = std::make_unique<FFmpegDecodingLoop>(codec_context_.get());
+ samples_per_second_ = config.samples_per_second;
++ bytes_per_frame_ = codec_context_->channels * config.bits_per_channel / 8;
+- bytes_per_frame_ =
+- codec_context_->ch_layout.nb_channels * config.bits_per_channel / 8;
+ output_timestamp_helper_ =
+ std::make_unique<AudioTimestampHelper>(config.samples_per_second);
+ is_initialized_ = true;
+
+ // Store initial values to guard against midstream configuration changes.
++ channels_ = codec_context_->channels;
+- channels_ = codec_context_->ch_layout.nb_channels;
+ av_sample_format_ = codec_context_->sample_fmt;
+
+ return true;
+@@ -292,19 +291,17 @@
+ for (auto& frame : audio_frames) {
+ int decoded_audio_size = 0;
+ if (frame->sample_rate != samples_per_second_ ||
++ frame->channels != channels_ || frame->format != av_sample_format_) {
+- frame->ch_layout.nb_channels != channels_ ||
+- frame->format != av_sample_format_) {
+ DLOG(ERROR) << "Unsupported midstream configuration change!"
+ << " Sample Rate: " << frame->sample_rate << " vs "
++ << samples_per_second_ << ", Channels: " << frame->channels
++ << " vs " << channels_ << ", Sample Format: " << frame->format
++ << " vs " << av_sample_format_;
+- << samples_per_second_
+- << ", Channels: " << frame->ch_layout.nb_channels << " vs "
+- << channels_ << ", Sample Format: " << frame->format << " vs "
+- << av_sample_format_;
+ return cdm::kDecodeError;
+ }
+
+ decoded_audio_size = av_samples_get_buffer_size(
++ nullptr, codec_context_->channels, frame->nb_samples,
+- nullptr, codec_context_->ch_layout.nb_channels, frame->nb_samples,
+ codec_context_->sample_fmt, 1);
+ if (!decoded_audio_size)
+ continue;
+@@ -323,9 +320,9 @@
+ size_t* total_size,
+ std::vector<std::unique_ptr<AVFrame, ScopedPtrAVFreeFrame>>* audio_frames,
+ AVFrame* frame) {
++ *total_size += av_samples_get_buffer_size(nullptr, codec_context_->channels,
++ frame->nb_samples,
++ codec_context_->sample_fmt, 1);
+- *total_size += av_samples_get_buffer_size(
+- nullptr, codec_context_->ch_layout.nb_channels, frame->nb_samples,
+- codec_context_->sample_fmt, 1);
+ audio_frames->emplace_back(av_frame_clone(frame));
+ return true;
+ }
+--- b/media/ffmpeg/ffmpeg_common.cc
++++ a/media/ffmpeg/ffmpeg_common.cc
+@@ -345,11 +345,10 @@
+ codec_context->sample_fmt, codec_context->codec_id);
+
+ ChannelLayout channel_layout =
++ codec_context->channels > 8
+- codec_context->ch_layout.nb_channels > 8
+ ? CHANNEL_LAYOUT_DISCRETE
++ : ChannelLayoutToChromeChannelLayout(codec_context->channel_layout,
++ codec_context->channels);
+- : ChannelLayoutToChromeChannelLayout(
+- codec_context->ch_layout.u.mask,
+- codec_context->ch_layout.nb_channels);
+
+ int sample_rate = codec_context->sample_rate;
+ switch (codec) {
+@@ -402,7 +401,7 @@
+ extra_data, encryption_scheme, seek_preroll,
+ codec_context->delay);
+ if (channel_layout == CHANNEL_LAYOUT_DISCRETE)
++ config->SetChannelsForDiscrete(codec_context->channels);
+- config->SetChannelsForDiscrete(codec_context->ch_layout.nb_channels);
+
+ #if BUILDFLAG(ENABLE_PLATFORM_AC3_EAC3_AUDIO)
+ // These are bitstream formats unknown to ffmpeg, so they don't have
+@@ -471,7 +470,7 @@
+
+ // TODO(scherkus): should we set |channel_layout|? I'm not sure if FFmpeg uses
+ // said information to decode.
++ codec_context->channels = config.channels();
+- codec_context->ch_layout.nb_channels = config.channels();
+ codec_context->sample_rate = config.samples_per_second();
+
+ if (config.extra_data().empty()) {
+--- b/media/filters/audio_file_reader.cc
++++ a/media/filters/audio_file_reader.cc
+@@ -113,15 +113,14 @@
+
+ // Verify the channel layout is supported by Chrome. Acts as a sanity check
+ // against invalid files. See http://crbug.com/171962
++ if (ChannelLayoutToChromeChannelLayout(codec_context_->channel_layout,
++ codec_context_->channels) ==
+- if (ChannelLayoutToChromeChannelLayout(
+- codec_context_->ch_layout.u.mask,
+- codec_context_->ch_layout.nb_channels) ==
+ CHANNEL_LAYOUT_UNSUPPORTED) {
+ return false;
+ }
+
+ // Store initial values to guard against midstream configuration changes.
++ channels_ = codec_context_->channels;
+- channels_ = codec_context_->ch_layout.nb_channels;
+ audio_codec_ = CodecIDToAudioCodec(codec_context_->codec_id);
+ sample_rate_ = codec_context_->sample_rate;
+ av_sample_format_ = codec_context_->sample_fmt;
+@@ -224,7 +223,7 @@
+ if (frames_read < 0)
+ return false;
+
++ const int channels = frame->channels;
+- const int channels = frame->ch_layout.nb_channels;
+ if (frame->sample_rate != sample_rate_ || channels != channels_ ||
+ frame->format != av_sample_format_) {
+ DLOG(ERROR) << "Unsupported midstream configuration change!"
+--- b/media/filters/audio_file_reader_unittest.cc
++++ a/media/filters/audio_file_reader_unittest.cc
+@@ -121,11 +121,11 @@
+ EXPECT_FALSE(reader_->Open());
+ }
+
++ void RunTestFailingDecode(const char* fn) {
+- void RunTestFailingDecode(const char* fn, int expect_read = 0) {
+ Initialize(fn);
+ EXPECT_TRUE(reader_->Open());
+ std::vector<std::unique_ptr<AudioBus>> decoded_audio_packets;
++ EXPECT_EQ(reader_->Read(&decoded_audio_packets), 0);
+- EXPECT_EQ(reader_->Read(&decoded_audio_packets), expect_read);
+ }
+
+ void RunTestPartialDecode(const char* fn) {
+@@ -219,7 +219,7 @@
+ }
+
+ TEST_F(AudioFileReaderTest, MidStreamConfigChangesFail) {
++ RunTestFailingDecode("midstream_config_change.mp3");
+- RunTestFailingDecode("midstream_config_change.mp3", 42624);
+ }
+ #endif
+
+--- b/media/filters/audio_video_metadata_extractor.cc
++++ a/media/filters/audio_video_metadata_extractor.cc
+@@ -113,15 +113,6 @@
+ if (!stream)
+ continue;
+
+- void* display_matrix =
+- av_stream_get_side_data(stream, AV_PKT_DATA_DISPLAYMATRIX, nullptr);
+- if (display_matrix) {
+- rotation_ = VideoTransformation::FromFFmpegDisplayMatrix(
+- static_cast<int32_t*>(display_matrix))
+- .rotation;
+- info.tags["rotate"] = base::NumberToString(rotation_);
+- }
+-
+ // Extract dictionary from streams also. Needed for containers that attach
+ // metadata to contained streams instead the container itself, like OGG.
+ ExtractDictionary(stream->metadata, &info.tags);
+@@ -264,6 +255,8 @@
+ if (raw_tags->find(tag->key) == raw_tags->end())
+ (*raw_tags)[tag->key] = tag->value;
+
++ if (ExtractInt(tag, "rotate", &rotation_))
++ continue;
+ if (ExtractString(tag, "album", &album_))
+ continue;
+ if (ExtractString(tag, "artist", &artist_))
+--- b/media/filters/ffmpeg_aac_bitstream_converter.cc
++++ a/media/filters/ffmpeg_aac_bitstream_converter.cc
+@@ -195,15 +195,14 @@
+ if (!header_generated_ || codec_ != stream_codec_parameters_->codec_id ||
+ audio_profile_ != stream_codec_parameters_->profile ||
+ sample_rate_index_ != sample_rate_index ||
++ channel_configuration_ != stream_codec_parameters_->channels ||
+- channel_configuration_ !=
+- stream_codec_parameters_->ch_layout.nb_channels ||
+ frame_length_ != header_plus_packet_size) {
+ header_generated_ =
+ GenerateAdtsHeader(stream_codec_parameters_->codec_id,
+ 0, // layer
+ stream_codec_parameters_->profile, sample_rate_index,
+ 0, // private stream
++ stream_codec_parameters_->channels,
+- stream_codec_parameters_->ch_layout.nb_channels,
+ 0, // originality
+ 0, // home
+ 0, // copyrighted_stream
+@@ -215,7 +214,7 @@
+ codec_ = stream_codec_parameters_->codec_id;
+ audio_profile_ = stream_codec_parameters_->profile;
+ sample_rate_index_ = sample_rate_index;
++ channel_configuration_ = stream_codec_parameters_->channels;
+- channel_configuration_ = stream_codec_parameters_->ch_layout.nb_channels;
+ frame_length_ = header_plus_packet_size;
+ }
+
+--- b/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc
++++ a/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc
+@@ -34,7 +34,7 @@
+ memset(&test_parameters_, 0, sizeof(AVCodecParameters));
+ test_parameters_.codec_id = AV_CODEC_ID_AAC;
+ test_parameters_.profile = FF_PROFILE_AAC_MAIN;
++ test_parameters_.channels = 2;
+- test_parameters_.ch_layout.nb_channels = 2;
+ test_parameters_.extradata = extradata_header_;
+ test_parameters_.extradata_size = sizeof(extradata_header_);
+ }
+--- b/media/filters/ffmpeg_audio_decoder.cc
++++ a/media/filters/ffmpeg_audio_decoder.cc
+@@ -28,7 +28,7 @@
+
+ // Return the number of channels from the data in |frame|.
+ static inline int DetermineChannels(AVFrame* frame) {
++ return frame->channels;
+- return frame->ch_layout.nb_channels;
+ }
+
+ // Called by FFmpeg's allocation routine to allocate a buffer. Uses
+@@ -231,7 +231,7 @@
+ // Translate unsupported into discrete layouts for discrete configurations;
+ // ffmpeg does not have a labeled discrete configuration internally.
+ ChannelLayout channel_layout = ChannelLayoutToChromeChannelLayout(
++ codec_context_->channel_layout, codec_context_->channels);
+- codec_context_->ch_layout.u.mask, codec_context_->ch_layout.nb_channels);
+ if (channel_layout == CHANNEL_LAYOUT_UNSUPPORTED &&
+ config_.channel_layout() == CHANNEL_LAYOUT_DISCRETE) {
+ channel_layout = CHANNEL_LAYOUT_DISCRETE;
+@@ -348,11 +348,11 @@
+ // Success!
+ av_sample_format_ = codec_context_->sample_fmt;
+
++ if (codec_context_->channels != config.channels()) {
+- if (codec_context_->ch_layout.nb_channels != config.channels()) {
+ MEDIA_LOG(ERROR, media_log_)
+ << "Audio configuration specified " << config.channels()
+ << " channels, but FFmpeg thinks the file contains "
++ << codec_context_->channels << " channels";
+- << codec_context_->ch_layout.nb_channels << " channels";
+ ReleaseFFmpegResources();
+ state_ = DecoderState::kUninitialized;
+ return false;
+@@ -403,7 +403,7 @@
+ if (frame->nb_samples <= 0)
+ return AVERROR(EINVAL);
+
++ if (s->channels != channels) {
+- if (s->ch_layout.nb_channels != channels) {
+ DLOG(ERROR) << "AVCodecContext and AVFrame disagree on channel count.";
+ return AVERROR(EINVAL);
+ }
+@@ -436,8 +436,7 @@
+ ChannelLayout channel_layout =
+ config_.channel_layout() == CHANNEL_LAYOUT_DISCRETE
+ ? CHANNEL_LAYOUT_DISCRETE
++ : ChannelLayoutToChromeChannelLayout(s->channel_layout, s->channels);
+- : ChannelLayoutToChromeChannelLayout(s->ch_layout.u.mask,
+- s->ch_layout.nb_channels);
+
+ if (channel_layout == CHANNEL_LAYOUT_UNSUPPORTED) {
+ DLOG(ERROR) << "Unsupported channel layout.";
diff --git a/sql-VirtualCursor-standard-layout.patch b/sql-VirtualCursor-standard-layout.patch
deleted file mode 100644
index a4864ba..0000000
--- a/sql-VirtualCursor-standard-layout.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-From 80368f8ba7a8bab13440463a254888311efe3986 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Tue, 04 May 2021 15:00:19 +0000
-Subject: [PATCH] sql: make VirtualCursor standard layout type
-
-sql::recover::VirtualCursor needs to be a standard layout type, but
-has members of type std::unique_ptr. However, std::unique_ptr is not
-guaranteed to be standard layout. Compiling with clang combined with
-gcc-11 libstdc++ fails because of this. Replace std::unique_ptr with
-raw pointers.
-
-Bug: 1189788
-Change-Id: Ia6dc388cc5ef1c0f2afc75f8ca45b9f12687ca9c
----
-
-diff --git a/sql/recover_module/btree.cc b/sql/recover_module/btree.cc
-index 9ecaafe..839318a 100644
---- a/sql/recover_module/btree.cc
-+++ b/sql/recover_module/btree.cc
-@@ -135,16 +135,25 @@
- "Move the destructor to the .cc file if it's non-trival");
- #endif // !DCHECK_IS_ON()
-
--LeafPageDecoder::LeafPageDecoder(DatabasePageReader* db_reader) noexcept
-- : page_id_(db_reader->page_id()),
-- db_reader_(db_reader),
-- cell_count_(ComputeCellCount(db_reader)),
-- next_read_index_(0),
-- last_record_size_(0) {
-+void LeafPageDecoder::Initialize(DatabasePageReader* db_reader) {
-+ DCHECK(db_reader);
- DCHECK(IsOnValidPage(db_reader));
-+ page_id_ = db_reader->page_id();
-+ db_reader_ = db_reader;
-+ cell_count_ = ComputeCellCount(db_reader);
-+ next_read_index_ = 0;
-+ last_record_size_ = 0;
- DCHECK(DatabasePageReader::IsValidPageId(page_id_));
- }
-
-+void LeafPageDecoder::Reset() {
-+ db_reader_ = nullptr;
-+ page_id_ = 0;
-+ cell_count_ = 0;
-+ next_read_index_ = 0;
-+ last_record_size_ = 0;
-+}
-+
- bool LeafPageDecoder::TryAdvance() {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- DCHECK(CanAdvance());
-diff --git a/sql/recover_module/btree.h b/sql/recover_module/btree.h
-index d76d076..33114b0 100644
---- a/sql/recover_module/btree.h
-+++ b/sql/recover_module/btree.h
-@@ -102,7 +102,7 @@
- //
- // |db_reader| must have been used to read an inner page of a table B-tree.
- // |db_reader| must outlive this instance.
-- explicit LeafPageDecoder(DatabasePageReader* db_reader) noexcept;
-+ explicit LeafPageDecoder() noexcept = default;
- ~LeafPageDecoder() noexcept = default;
-
- LeafPageDecoder(const LeafPageDecoder&) = delete;
-@@ -150,6 +150,15 @@
- // read as long as CanAdvance() returns true.
- bool TryAdvance();
-
-+ // Initialize with DatabasePageReader
-+ void Initialize(DatabasePageReader* db_reader);
-+
-+ // Reset internal DatabasePageReader
-+ void Reset();
-+
-+ // True if DatabasePageReader is valid
-+ bool IsValid() { return (db_reader_ != nullptr); }
-+
- // True if the given reader may point to an inner page in a table B-tree.
- //
- // The last ReadPage() call on |db_reader| must have succeeded.
-@@ -163,14 +172,14 @@
- static int ComputeCellCount(DatabasePageReader* db_reader);
-
- // The number of the B-tree page this reader is reading.
-- const int64_t page_id_;
-+ int64_t page_id_;
- // Used to read the tree page.
- //
- // Raw pointer usage is acceptable because this instance's owner is expected
- // to ensure that the DatabasePageReader outlives this.
-- DatabasePageReader* const db_reader_;
-+ DatabasePageReader* db_reader_;
- // Caches the ComputeCellCount() value for this reader's page.
-- const int cell_count_ = ComputeCellCount(db_reader_);
-+ int cell_count_;
-
- // The reader's cursor state.
- //
-diff --git a/sql/recover_module/cursor.cc b/sql/recover_module/cursor.cc
-index 0029ff9..42548bc 100644
---- a/sql/recover_module/cursor.cc
-+++ b/sql/recover_module/cursor.cc
-@@ -26,7 +26,7 @@
- int VirtualCursor::First() {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- inner_decoders_.clear();
-- leaf_decoder_ = nullptr;
-+ leaf_decoder_.Reset();
-
- AppendPageDecoder(table_->root_page_id());
- return Next();
-@@ -36,18 +36,18 @@
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- record_reader_.Reset();
-
-- while (!inner_decoders_.empty() || leaf_decoder_.get()) {
-- if (leaf_decoder_.get()) {
-- if (!leaf_decoder_->CanAdvance()) {
-+ while (!inner_decoders_.empty() || leaf_decoder_.IsValid()) {
-+ if (leaf_decoder_.IsValid()) {
-+ if (!leaf_decoder_.CanAdvance()) {
- // The leaf has been exhausted. Remove it from the DFS stack.
-- leaf_decoder_ = nullptr;
-+ leaf_decoder_.Reset();
- continue;
- }
-- if (!leaf_decoder_->TryAdvance())
-+ if (!leaf_decoder_.TryAdvance())
- continue;
-
-- if (!payload_reader_.Initialize(leaf_decoder_->last_record_size(),
-- leaf_decoder_->last_record_offset())) {
-+ if (!payload_reader_.Initialize(leaf_decoder_.last_record_size(),
-+ leaf_decoder_.last_record_offset())) {
- continue;
- }
- if (!record_reader_.Initialize())
-@@ -99,13 +99,13 @@
- int64_t VirtualCursor::RowId() {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- DCHECK(record_reader_.IsInitialized());
-- DCHECK(leaf_decoder_.get());
-- return leaf_decoder_->last_record_rowid();
-+ DCHECK(leaf_decoder_.IsValid());
-+ return leaf_decoder_.last_record_rowid();
- }
-
- void VirtualCursor::AppendPageDecoder(int page_id) {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-- DCHECK(leaf_decoder_.get() == nullptr)
-+ DCHECK(!leaf_decoder_.IsValid())
- << __func__
- << " must only be called when the current path has no leaf decoder";
-
-@@ -113,7 +113,7 @@
- return;
-
- if (LeafPageDecoder::IsOnValidPage(&db_reader_)) {
-- leaf_decoder_ = std::make_unique<LeafPageDecoder>(&db_reader_);
-+ leaf_decoder_.Initialize(&db_reader_);
- return;
- }
-
-diff --git a/sql/recover_module/cursor.h b/sql/recover_module/cursor.h
-index afcd690..b15c31d 100644
---- a/sql/recover_module/cursor.h
-+++ b/sql/recover_module/cursor.h
-@@ -129,7 +129,7 @@
- std::vector<std::unique_ptr<InnerPageDecoder>> inner_decoders_;
-
- // Decodes the leaf page containing records.
-- std::unique_ptr<LeafPageDecoder> leaf_decoder_;
-+ LeafPageDecoder leaf_decoder_;
-
- SEQUENCE_CHECKER(sequence_checker_);
- };
-diff --git a/sql/recover_module/pager.cc b/sql/recover_module/pager.cc
-index 58e75de..5fe9620 100644
---- a/sql/recover_module/pager.cc
-+++ b/sql/recover_module/pager.cc
-@@ -23,8 +23,7 @@
- "ints are not appropriate for representing page IDs");
-
- DatabasePageReader::DatabasePageReader(VirtualTable* table)
-- : page_data_(std::make_unique<uint8_t[]>(table->page_size())),
-- table_(table) {
-+ : page_data_(), table_(table) {
- DCHECK(table != nullptr);
- DCHECK(IsValidPageSize(table->page_size()));
- }
-@@ -57,8 +56,8 @@
- std::numeric_limits<int64_t>::max(),
- "The |read_offset| computation above may overflow");
-
-- int sqlite_status =
-- RawRead(sqlite_file, read_size, read_offset, page_data_.get());
-+ int sqlite_status = RawRead(sqlite_file, read_size, read_offset,
-+ const_cast<uint8_t*>(page_data_.data()));
-
- // |page_id_| needs to be set to kInvalidPageId if the read failed.
- // Otherwise, future ReadPage() calls with the previous |page_id_| value
-diff --git a/sql/recover_module/pager.h b/sql/recover_module/pager.h
-index 0e388ddc..99314e3 100644
---- a/sql/recover_module/pager.h
-+++ b/sql/recover_module/pager.h
-@@ -5,6 +5,7 @@
- #ifndef SQL_RECOVER_MODULE_PAGER_H_
- #define SQL_RECOVER_MODULE_PAGER_H_
-
-+#include <array>
- #include <cstdint>
- #include <memory>
-
-@@ -70,7 +71,7 @@
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- DCHECK_NE(page_id_, kInvalidPageId)
- << "Successful ReadPage() required before accessing pager state";
-- return page_data_.get();
-+ return page_data_.data();
- }
-
- // The number of bytes in the page read by the last ReadPage() call.
-@@ -137,7 +138,7 @@
- int page_id_ = kInvalidPageId;
- // Stores the bytes of the last page successfully read by ReadPage().
- // The content is undefined if the last call to ReadPage() did not succeed.
-- const std::unique_ptr<uint8_t[]> page_data_;
-+ const std::array<uint8_t, kMaxPageSize> page_data_;
- // Raw pointer usage is acceptable because this instance's owner is expected
- // to ensure that the VirtualTable outlives this.
- VirtualTable* const table_;
diff --git a/sql-make-VirtualCursor-standard-layout-type.patch b/sql-make-VirtualCursor-standard-layout-type.patch
deleted file mode 100644
index 2ebd262..0000000
--- a/sql-make-VirtualCursor-standard-layout-type.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-diff -up chromium-94.0.4606.61/sql/recover_module/btree.cc.17~ chromium-94.0.4606.61/sql/recover_module/btree.cc
---- chromium-94.0.4606.61/sql/recover_module/btree.cc.17~ 2021-09-24 06:26:10.000000000 +0200
-+++ chromium-94.0.4606.61/sql/recover_module/btree.cc 2021-09-25 02:00:19.610366450 +0200
-@@ -136,16 +136,25 @@ static_assert(std::is_trivially_destruct
- "Move the destructor to the .cc file if it's non-trival");
- #endif // !DCHECK_IS_ON()
-
--LeafPageDecoder::LeafPageDecoder(DatabasePageReader* db_reader) noexcept
-- : page_id_(db_reader->page_id()),
-- db_reader_(db_reader),
-- cell_count_(ComputeCellCount(db_reader)),
-- next_read_index_(0),
-- last_record_size_(0) {
-+void LeafPageDecoder::Initialize(DatabasePageReader* db_reader) {
-+ DCHECK(db_reader);
- DCHECK(IsOnValidPage(db_reader));
-+ page_id_ = db_reader->page_id();
-+ db_reader_ = db_reader;
-+ cell_count_ = ComputeCellCount(db_reader);
-+ next_read_index_ = 0;
-+ last_record_size_ = 0;
- DCHECK(DatabasePageReader::IsValidPageId(page_id_));
- }
-
-+void LeafPageDecoder::Reset() {
-+ db_reader_ = nullptr;
-+ page_id_ = 0;
-+ cell_count_ = 0;
-+ next_read_index_ = 0;
-+ last_record_size_ = 0;
-+}
-+
- bool LeafPageDecoder::TryAdvance() {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- DCHECK(CanAdvance());
-diff -up chromium-94.0.4606.61/sql/recover_module/btree.h.17~ chromium-94.0.4606.61/sql/recover_module/btree.h
---- chromium-94.0.4606.61/sql/recover_module/btree.h.17~ 2021-09-24 06:26:10.000000000 +0200
-+++ chromium-94.0.4606.61/sql/recover_module/btree.h 2021-09-25 02:00:19.610366450 +0200
-@@ -103,7 +103,7 @@ class LeafPageDecoder {
- //
- // |db_reader| must have been used to read an inner page of a table B-tree.
- // |db_reader| must outlive this instance.
-- explicit LeafPageDecoder(DatabasePageReader* db_reader) noexcept;
-+ explicit LeafPageDecoder() noexcept = default;
- ~LeafPageDecoder() noexcept = default;
-
- LeafPageDecoder(const LeafPageDecoder&) = delete;
-@@ -151,6 +151,15 @@ class LeafPageDecoder {
- // read as long as CanAdvance() returns true.
- bool TryAdvance();
-
-+ // Initialize with DatabasePageReader
-+ void Initialize(DatabasePageReader* db_reader);
-+
-+ // Reset internal DatabasePageReader
-+ void Reset();
-+
-+ // True if DatabasePageReader is valid
-+ bool IsValid() { return (db_reader_ != nullptr); }
-+
- // True if the given reader may point to an inner page in a table B-tree.
- //
- // The last ReadPage() call on |db_reader| must have succeeded.
-@@ -164,14 +173,14 @@ class LeafPageDecoder {
- static int ComputeCellCount(DatabasePageReader* db_reader);
-
- // The number of the B-tree page this reader is reading.
-- const int64_t page_id_;
-+ int64_t page_id_;
- // Used to read the tree page.
- //
- // Raw pointer usage is acceptable because this instance's owner is expected
- // to ensure that the DatabasePageReader outlives this.
-- DatabasePageReader* const db_reader_;
-+ DatabasePageReader* db_reader_;
- // Caches the ComputeCellCount() value for this reader's page.
-- const int cell_count_ = ComputeCellCount(db_reader_);
-+ int cell_count_;
-
- // The reader's cursor state.
- //
-diff -up chromium-94.0.4606.61/sql/recover_module/cursor.cc.17~ chromium-94.0.4606.61/sql/recover_module/cursor.cc
---- chromium-94.0.4606.61/sql/recover_module/cursor.cc.17~ 2021-09-24 06:26:10.000000000 +0200
-+++ chromium-94.0.4606.61/sql/recover_module/cursor.cc 2021-09-25 02:00:19.610366450 +0200
-@@ -28,7 +28,7 @@ VirtualCursor::~VirtualCursor() {
- int VirtualCursor::First() {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- inner_decoders_.clear();
-- leaf_decoder_ = nullptr;
-+ leaf_decoder_.Reset();
-
- AppendPageDecoder(table_->root_page_id());
- return Next();
-@@ -38,18 +38,18 @@ int VirtualCursor::Next() {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- record_reader_.Reset();
-
-- while (!inner_decoders_.empty() || leaf_decoder_.get()) {
-- if (leaf_decoder_.get()) {
-- if (!leaf_decoder_->CanAdvance()) {
-+ while (!inner_decoders_.empty() || leaf_decoder_.IsValid()) {
-+ if (leaf_decoder_.IsValid()) {
-+ if (!leaf_decoder_.CanAdvance()) {
- // The leaf has been exhausted. Remove it from the DFS stack.
-- leaf_decoder_ = nullptr;
-+ leaf_decoder_.Reset();
- continue;
- }
-- if (!leaf_decoder_->TryAdvance())
-+ if (!leaf_decoder_.TryAdvance())
- continue;
-
-- if (!payload_reader_.Initialize(leaf_decoder_->last_record_size(),
-- leaf_decoder_->last_record_offset())) {
-+ if (!payload_reader_.Initialize(leaf_decoder_.last_record_size(),
-+ leaf_decoder_.last_record_offset())) {
- continue;
- }
- if (!record_reader_.Initialize())
-@@ -101,13 +101,13 @@ int VirtualCursor::ReadColumn(int column
- int64_t VirtualCursor::RowId() {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- DCHECK(record_reader_.IsInitialized());
-- DCHECK(leaf_decoder_.get());
-- return leaf_decoder_->last_record_rowid();
-+ DCHECK(leaf_decoder_.IsValid());
-+ return leaf_decoder_.last_record_rowid();
- }
-
- void VirtualCursor::AppendPageDecoder(int page_id) {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-- DCHECK(leaf_decoder_.get() == nullptr)
-+ DCHECK(!leaf_decoder_.IsValid())
- << __func__
- << " must only be called when the current path has no leaf decoder";
-
-@@ -115,7 +115,7 @@ void VirtualCursor::AppendPageDecoder(in
- return;
-
- if (LeafPageDecoder::IsOnValidPage(&db_reader_)) {
-- leaf_decoder_ = std::make_unique<LeafPageDecoder>(&db_reader_);
-+ leaf_decoder_.Initialize(&db_reader_);
- return;
- }
-
-diff -up chromium-94.0.4606.61/sql/recover_module/cursor.h.17~ chromium-94.0.4606.61/sql/recover_module/cursor.h
---- chromium-94.0.4606.61/sql/recover_module/cursor.h.17~ 2021-09-24 06:26:10.000000000 +0200
-+++ chromium-94.0.4606.61/sql/recover_module/cursor.h 2021-09-25 02:00:19.610366450 +0200
-@@ -129,7 +129,7 @@ class VirtualCursor {
- std::vector<std::unique_ptr<InnerPageDecoder>> inner_decoders_;
-
- // Decodes the leaf page containing records.
-- std::unique_ptr<LeafPageDecoder> leaf_decoder_;
-+ LeafPageDecoder leaf_decoder_;
-
- SEQUENCE_CHECKER(sequence_checker_);
- };
-diff -up chromium-94.0.4606.61/sql/recover_module/pager.cc.17~ chromium-94.0.4606.61/sql/recover_module/pager.cc
---- chromium-94.0.4606.61/sql/recover_module/pager.cc.17~ 2021-09-24 06:26:10.000000000 +0200
-+++ chromium-94.0.4606.61/sql/recover_module/pager.cc 2021-09-25 02:00:19.610366450 +0200
-@@ -23,8 +23,7 @@ static_assert(DatabasePageReader::kMaxPa
- "ints are not appropriate for representing page IDs");
-
- DatabasePageReader::DatabasePageReader(VirtualTable* table)
-- : page_data_(std::make_unique<uint8_t[]>(table->page_size())),
-- table_(table) {
-+ : page_data_(), table_(table) {
- DCHECK(table != nullptr);
- DCHECK(IsValidPageSize(table->page_size()));
- }
-@@ -57,8 +56,8 @@ int DatabasePageReader::ReadPage(int pag
- std::numeric_limits<int64_t>::max(),
- "The |read_offset| computation above may overflow");
-
-- int sqlite_status =
-- RawRead(sqlite_file, read_size, read_offset, page_data_.get());
-+ int sqlite_status = RawRead(sqlite_file, read_size, read_offset,
-+ const_cast<uint8_t*>(page_data_.data()));
-
- // |page_id_| needs to be set to kInvalidPageId if the read failed.
- // Otherwise, future ReadPage() calls with the previous |page_id_| value
-diff -up chromium-94.0.4606.61/sql/recover_module/pager.h.17~ chromium-94.0.4606.61/sql/recover_module/pager.h
---- chromium-94.0.4606.61/sql/recover_module/pager.h.17~ 2021-09-24 06:26:10.000000000 +0200
-+++ chromium-94.0.4606.61/sql/recover_module/pager.h 2021-09-25 02:00:59.844573377 +0200
-@@ -5,6 +5,7 @@
- #ifndef SQL_RECOVER_MODULE_PAGER_H_
- #define SQL_RECOVER_MODULE_PAGER_H_
-
-+#include <array>
- #include <cstdint>
- #include <memory>
- #include <ostream>
-@@ -71,7 +72,7 @@ class DatabasePageReader {
- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- DCHECK_NE(page_id_, kInvalidPageId)
- << "Successful ReadPage() required before accessing pager state";
-- return page_data_.get();
-+ return page_data_.data();
- }
-
- // The number of bytes in the page read by the last ReadPage() call.
-@@ -138,7 +139,7 @@ class DatabasePageReader {
- int page_id_ = kInvalidPageId;
- // Stores the bytes of the last page successfully read by ReadPage().
- // The content is undefined if the last call to ReadPage() did not succeed.
-- const std::unique_ptr<uint8_t[]> page_data_;
-+ const std::array<uint8_t, kMaxPageSize> page_data_;
- // Raw pointer usage is acceptable because this instance's owner is expected
- // to ensure that the VirtualTable outlives this.
- VirtualTable* const table_;
diff --git a/subpixel-anti-aliasing-in-FreeType-2.8.1.patch b/subpixel-anti-aliasing-in-FreeType-2.8.1.patch
deleted file mode 100644
index ad49484..0000000
--- a/subpixel-anti-aliasing-in-FreeType-2.8.1.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From f25787b72c20e97cdeb74e037dc1ff56a88b45c6 Mon Sep 17 00:00:00 2001
-From: Ben Wagner <bungeman@google.com>
-Date: Tue, 1 Dec 2020 20:22:00 -0500
-Subject: [PATCH] Subpixel anti-aliasing in FreeType 2.8.1+
-
-FreeType 2.8.1 and later always provide some form of subpixel
-anti-aliasing.
-
-Bug: skia:10950,skia:6663
-Change-Id: I666cc942e73b73073cdabf900c25faa10d9aaf0f
-Reviewed-on: https://skia-review.googlesource.com/c/skia/+/339861
-Reviewed-by: Herb Derby <herb@google.com>
-Commit-Queue: Ben Wagner <bungeman@google.com>
----
- src/ports/SkFontHost_FreeType.cpp | 33 ++++++++++++++++++++-----------
- 1 file changed, 22 insertions(+), 11 deletions(-)
-
-diff --git a/third_party/skia/src/ports/SkFontHost_FreeType.cpp b/third_party/skia/src/ports/SkFontHost_FreeType.cpp
-index 990eff4f5e..c0aeb792da 100644
---- a/third_party/skia/src/ports/SkFontHost_FreeType.cpp
-+++ b/third_party/skia/src/ports/SkFontHost_FreeType.cpp
-@@ -32,6 +32,7 @@
- #include "src/utils/SkMatrix22.h"
-
- #include <memory>
-+#include <tuple>
-
- #include <ft2build.h>
- #include FT_ADVANCES_H
-@@ -147,13 +148,16 @@ public:
- // *reinterpret_cast<void**>(&procPtr) = dlsym(self, "proc");
- // because clang has not implemented DR573. See http://clang.llvm.org/cxx_dr_status.html .
-
-- FT_Int major, minor, patch;
-- FT_Library_Version(fLibrary, &major, &minor, &patch);
-+ using Version = std::tuple<FT_Int, FT_Int, FT_Int>;
-+ Version version;
-+ FT_Library_Version(fLibrary, &std::get<0>(version),
-+ &std::get<1>(version),
-+ &std::get<2>(version));
-
- #if SK_FREETYPE_MINIMUM_RUNTIME_VERSION >= 0x02070100
- fGetVarDesignCoordinates = FT_Get_Var_Design_Coordinates;
- #elif SK_FREETYPE_MINIMUM_RUNTIME_VERSION & SK_FREETYPE_DLOPEN
-- if (major > 2 || ((major == 2 && minor > 7) || (major == 2 && minor == 7 && patch >= 0))) {
-+ if (Version(2,7,0) <= version) {
- //The FreeType library is already loaded, so symbols are available in process.
- void* self = dlopen(nullptr, RTLD_LAZY);
- if (self) {
-@@ -166,7 +170,7 @@ public:
- #if SK_FREETYPE_MINIMUM_RUNTIME_VERSION >= 0x02070200
- FT_Set_Default_Properties(fLibrary);
- #elif SK_FREETYPE_MINIMUM_RUNTIME_VERSION & SK_FREETYPE_DLOPEN
-- if (major > 2 || ((major == 2 && minor > 7) || (major == 2 && minor == 7 && patch >= 1))) {
-+ if (Version(2,7,1) <= version) {
- //The FreeType library is already loaded, so symbols are available in process.
- void* self = dlopen(nullptr, RTLD_LAZY);
- if (self) {
-@@ -185,7 +189,7 @@ public:
- #if SK_FREETYPE_MINIMUM_RUNTIME_VERSION >= 0x02080000
- fLightHintingIsYOnly = true;
- #else
-- if (major > 2 || ((major == 2 && minor > 8) || (major == 2 && minor == 8 && patch >= 0))) {
-+ if (Version(2,8,0) <= version) {
- fLightHintingIsYOnly = true;
- }
- #endif
-@@ -194,7 +198,7 @@ public:
- #if SK_FREETYPE_MINIMUM_RUNTIME_VERSION >= 0x02080100
- fGetVarAxisFlags = FT_Get_Var_Axis_Flags;
- #elif SK_FREETYPE_MINIMUM_RUNTIME_VERSION & SK_FREETYPE_DLOPEN
-- if (major > 2 || ((major == 2 && minor > 7) || (major == 2 && minor == 7 && patch >= 0))) {
-+ if (Version(2,7,0) <= version) {
- //The FreeType library is already loaded, so symbols are available in process.
- void* self = dlopen(nullptr, RTLD_LAZY);
- if (self) {
-@@ -204,11 +208,18 @@ public:
- }
- #endif
-
-- // Setup LCD filtering. This reduces color fringes for LCD smoothed glyphs.
-- // The default has changed over time, so this doesn't mean the same thing to all users.
-- if (FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT) == 0) {
-- fIsLCDSupported = true;
-- fLCDExtra = 2; //Using a filter adds one full pixel to each side.
-+ fIsLCDSupported =
-+ // Subpixel anti-aliasing may be unfiltered until the LCD filter is set.
-+ // Newer versions may still need this, so this test with side effects must come first.
-+ // The default has changed over time, so this doesn't mean the same thing to all users.
-+ (FT_Library_SetLcdFilter(fLibrary, FT_LCD_FILTER_DEFAULT) == 0) ||
-+
-+ // In 2.8.1 and later FreeType always provides some form of subpixel anti-aliasing.
-+ ((SK_FREETYPE_MINIMUM_RUNTIME_VERSION) >= 0x02080100) ||
-+ (Version(2,8,1) <= version);
-+
-+ if (fIsLCDSupported) {
-+ fLCDExtra = 2; // Using a filter may require up to one full pixel to each side.
- }
- }
- ~FreeTypeLibrary() {
diff --git a/vdpau-support.patch b/vdpau-support.patch
deleted file mode 100644
index 12155da..0000000
--- a/vdpau-support.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-diff -up chromium-93.0.4577.42/media/gpu/vaapi/vaapi_video_decode_accelerator.cc.23~ chromium-93.0.4577.42/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
---- chromium-93.0.4577.42/media/gpu/vaapi/vaapi_video_decode_accelerator.cc.23~ 2021-08-12 21:10:18.000000000 +0200
-+++ chromium-93.0.4577.42/media/gpu/vaapi/vaapi_video_decode_accelerator.cc 2021-08-15 05:43:22.496747377 +0200
-@@ -714,7 +714,8 @@ void VaapiVideoDecodeAccelerator::Assign
- // implementation we get from |vaapi_picture_factory_| requires the video
- // processing pipeline for downloading the decoded frame from the internal
- // surface, we need to create a |vpp_vaapi_wrapper_|.
-- if (requires_vpp && buffer_allocation_mode_ != BufferAllocationMode::kNone) {
-+ if (requires_vpp && buffer_allocation_mode_ != BufferAllocationMode::kNone &&
-+ buffer_allocation_mode_ != BufferAllocationMode::kWrapVdpau) {
- if (!vpp_vaapi_wrapper_) {
- vpp_vaapi_wrapper_ = VaapiWrapper::Create(
- VaapiWrapper::kVideoProcess, VAProfileNone,
-@@ -1228,6 +1229,12 @@ VaapiVideoDecodeAccelerator::DecideBuffe
- return BufferAllocationMode::kReduced;
- return BufferAllocationMode::kSuperReduced;
- #else
-+ // NVIDIA blobs use VDPAU
-+ if (VaapiWrapper::GetImplementationType() == VAImplementation::kNVIDIAVDPAU) {
-+ LOG(INFO) << "VA-API driver on VDPAU backend";
-+ return BufferAllocationMode::kWrapVdpau;
-+ }
-+
- // TODO(crbug.com/912295): Enable a better BufferAllocationMode for IMPORT
- // |output_mode_| as well.
- if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT)
-@@ -1238,7 +1245,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe
- // associated format reconciliation copy, avoiding all internal buffer
- // allocations.
- // TODO(crbug.com/911754): Enable for VP9 Profile 2.
-- if (IsGeminiLakeOrLater() &&
-+ if (false && IsGeminiLakeOrLater() &&
- (profile_ == VP9PROFILE_PROFILE0 || profile_ == VP8PROFILE_ANY ||
- (profile_ >= H264PROFILE_MIN && profile_ <= H264PROFILE_MAX))) {
- // Add one to the reference frames for the one being currently egressed, and
-diff -up chromium-93.0.4577.42/media/gpu/vaapi/vaapi_video_decode_accelerator.h.23~ chromium-93.0.4577.42/media/gpu/vaapi/vaapi_video_decode_accelerator.h
---- chromium-93.0.4577.42/media/gpu/vaapi/vaapi_video_decode_accelerator.h.23~ 2021-08-12 21:10:18.000000000 +0200
-+++ chromium-93.0.4577.42/media/gpu/vaapi/vaapi_video_decode_accelerator.h 2021-08-15 05:43:22.496747377 +0200
-@@ -212,6 +212,7 @@ class MEDIA_GPU_EXPORT VaapiVideoDecodeA
- // Using |client_|s provided PictureBuffers and as many internally
- // allocated.
- kNormal,
-+ kWrapVdpau,
- };
-
- // Decides the concrete buffer allocation mode, depending on the hardware
-diff -up chromium-93.0.4577.42/media/gpu/vaapi/vaapi_wrapper.cc.23~ chromium-93.0.4577.42/media/gpu/vaapi/vaapi_wrapper.cc
---- chromium-93.0.4577.42/media/gpu/vaapi/vaapi_wrapper.cc.23~ 2021-08-15 05:43:22.495747385 +0200
-+++ chromium-93.0.4577.42/media/gpu/vaapi/vaapi_wrapper.cc 2021-08-15 05:46:02.893592386 +0200
-@@ -224,6 +224,9 @@ media::VAImplementation VendorStringToIm
- } else if (base::StartsWith(va_vendor_string, "Intel iHD driver",
- base::CompareCase::SENSITIVE)) {
- return media::VAImplementation::kIntelIHD;
-+ } else if (base::StartsWith(va_vendor_string, "Splitted-Desktop Systems VDPAU",
-+ base::CompareCase::SENSITIVE)) {
-+ return media::VAImplementation::kNVIDIAVDPAU;
- }
- return media::VAImplementation::kOther;
- }
-@@ -2181,6 +2184,11 @@ VaapiWrapper::ExportVASurfaceAsNativePix
- return nullptr;
- }
-
-+ if (GetImplementationType() == VAImplementation::kNVIDIAVDPAU) {
-+ LOG(ERROR) << "Disabled due to potential breakage.";
-+ return nullptr;
-+ }
-+
- VADRMPRIMESurfaceDescriptor descriptor;
- {
- base::AutoLock auto_lock(*va_lock_);
-@@ -2892,6 +2900,10 @@ bool VaapiWrapper::CreateSurfaces(
- va_surfaces->resize(num_surfaces);
- VASurfaceAttrib attribute;
- memset(&attribute, 0, sizeof(attribute));
-+
-+ if (GetImplementationType() != VAImplementation::kNVIDIAVDPAU) {
-+ // Nvidia's VAAPI-VDPAU driver doesn't support this attribute
-+
- attribute.type = VASurfaceAttribUsageHint;
- attribute.flags = VA_SURFACE_ATTRIB_SETTABLE;
- attribute.value.type = VAGenericValueTypeInteger;
-@@ -2903,6 +2915,7 @@ bool VaapiWrapper::CreateSurfaces(
- static_assert(std::is_same<std::underlying_type<SurfaceUsageHint>::type,
- int32_t>::value,
- "The underlying type of SurfaceUsageHint is not int32_t");
-+ }
-
- VAStatus va_res;
- {
-diff -up chromium-93.0.4577.42/media/gpu/vaapi/vaapi_wrapper.h.23~ chromium-93.0.4577.42/media/gpu/vaapi/vaapi_wrapper.h
---- chromium-93.0.4577.42/media/gpu/vaapi/vaapi_wrapper.h.23~ 2021-08-12 21:10:18.000000000 +0200
-+++ chromium-93.0.4577.42/media/gpu/vaapi/vaapi_wrapper.h 2021-08-15 05:43:22.497747370 +0200
-@@ -89,6 +89,7 @@ enum class VAImplementation {
- kIntelIHD,
- kOther,
- kInvalid,
-+ kNVIDIAVDPAU,
- };
-
- // This class handles VA-API calls and ensures proper locking of VA-API calls
diff --git a/wayland-egl.patch b/wayland-egl.patch
deleted file mode 100644
index 58a0798..0000000
--- a/wayland-egl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/ui/gl/gl_image_native_pixmap.cc 2020-05-18 11:40:06.000000000 -0700
-+++ b/ui/gl/gl_image_native_pixmap.cc 2020-05-22 02:07:16.007770442 -0700
-@@ -288,6 +288,8 @@
- std::move(scoped_fd));
- }
-
-+ handle.planes[0].size = size_.GetArea();
-+
- return handle;
- #endif // !defined(OS_FUCHSIA)
- }
---- a/gpu/command_buffer/service/error_state.cc 2020-05-18 11:39:22.000000000 -0700
-+++ b/gpu/command_buffer/service/error_state.cc 2020-05-22 13:43:09.181180388 -0700
-@@ -115,6 +115,8 @@
- // buffer.
- error = GL_NO_ERROR;
- }
-+ if (error == GL_INVALID_ENUM)
-+ error = GL_NO_ERROR;
- return error;
- }
-