initial 89

2021-03-04 14:20:22 -05:00 · 2021-03-04 14:20:22 -05:00 · 870f34fc78
commit 870f34fc78
parent 1e97194a71
16 changed files with 386 additions and 266 deletions
--- a/chromium-75.0.3770.80-grpc-gettid-fix.patch
+++ b/chromium-75.0.3770.80-grpc-gettid-fix.patch
@ -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, '/');
--- a/chromium-79-gcc-protobuf-alignas.patch
+++ b/chromium-79-gcc-protobuf-alignas.patch
@ -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
-
--- a/chromium-80.0.3987.106-missing-cstring-header.patch
+++ b/chromium-80.0.3987.106-missing-cstring-header.patch
@ -1,34 +0,0 @@
-diff -up chromium-80.0.3987.106/third_party/webrtc/audio/utility/channel_mixer.cc.missing-cstring chromium-80.0.3987.106/third_party/webrtc/audio/utility/channel_mixer.cc
--- chromium-80.0.3987.106/third_party/webrtc/audio/utility/channel_mixer.cc.missing-cstring	2020-02-21 13:19:47.077683105 -0500
-+++ chromium-80.0.3987.106/third_party/webrtc/audio/utility/channel_mixer.cc	2020-02-21 13:19:47.077683105 -0500
-@@ -8,6 +8,8 @@
-  *  be found in the AUTHORS file in the root of the source tree.
-  */
- 
-+#include <cstring>
-+
- #include "audio/utility/channel_mixer.h"
- 
- #include "audio/utility/channel_mixing_matrix.h"
-diff -up chromium-80.0.3987.106/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc.missing-cstring chromium-80.0.3987.106/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
--- chromium-80.0.3987.106/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc.missing-cstring	2020-02-21 13:19:48.171659179 -0500
-+++ chromium-80.0.3987.106/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc	2020-02-21 13:19:48.174659113 -0500
-@@ -17,6 +17,7 @@
- #include <spa/param/video/raw-utils.h>
- #include <spa/support/type-map.h>
- 
-+#include <cstring>
- #include <memory>
- #include <utility>
- 
-diff -up chromium-80.0.3987.106/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc.missing-cstring chromium-80.0.3987.106/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc
--- chromium-80.0.3987.106/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc.missing-cstring	2020-02-21 13:30:09.609068057 -0500
-+++ chromium-80.0.3987.106/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc	2020-02-21 13:30:23.791757875 -0500
-@@ -10,6 +10,7 @@
- 
- #include "modules/video_coding/utility/ivf_file_reader.h"
- 
-+#include <cstring>
- #include <string>
- #include <vector>
- 
--- a/chromium-88.0.4324.11-enable-hardware-accelerated-mjpeg.patch
+++ b/chromium-88.0.4324.11-enable-hardware-accelerated-mjpeg.patch
@ -1,72 +0,0 @@
-diff -up chromium-88.0.4324.11/chrome/browser/about_flags.cc.accel-mjpeg chromium-88.0.4324.11/chrome/browser/about_flags.cc
--- chromium-88.0.4324.11/chrome/browser/about_flags.cc.accel-mjpeg	2020-11-19 20:51:19.000000000 -0500
-+++ chromium-88.0.4324.11/chrome/browser/about_flags.cc	2020-11-30 16:14:32.393366384 -0500
-@@ -3309,12 +3309,12 @@ const FeatureEntry kFeatureEntries[] = {
-      flag_descriptions::kWebXrForceRuntimeDescription, kOsDesktop,
-      MULTI_VALUE_TYPE(kWebXrForceRuntimeChoices)},
- #endif  // ENABLE_VR
-#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || defined(OS_LINUX)
-     {"disable-accelerated-mjpeg-decode",
-      flag_descriptions::kAcceleratedMjpegDecodeName,
-     flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS,
-+     flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS | kOsLinux,
-      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)},
-#endif  // OS_CHROMEOS
-+#endif  // OS_CHROMEOS || OS_LINUX
-     {"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName,
-      flag_descriptions::kSystemKeyboardLockDescription, kOsDesktop,
-      FEATURE_VALUE_TYPE(features::kSystemKeyboardLock)},
-diff -up chromium-88.0.4324.11/chrome/browser/flag_descriptions.cc.accel-mjpeg chromium-88.0.4324.11/chrome/browser/flag_descriptions.cc
--- chromium-88.0.4324.11/chrome/browser/flag_descriptions.cc.accel-mjpeg	2020-11-30 16:14:32.393366384 -0500
-+++ chromium-88.0.4324.11/chrome/browser/flag_descriptions.cc	2020-11-30 16:20:50.174195910 -0500
-@@ -3572,9 +3572,9 @@ const char kVideoToolboxVp9DecodingDescr
- 
- #endif
- 
-// Chrome OS -------------------------------------------------------------------
-+// Chrome OS and Linux ---------------------------------------------------------
- 
-#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID)) 
- 
- const char kAcceleratedMjpegDecodeName[] =
-     "Hardware-accelerated mjpeg decode for captured frame";
-@@ -3582,6 +3582,12 @@ const char kAcceleratedMjpegDecodeDescri
-     "Enable hardware-accelerated mjpeg decode for captured frame where "
-     "available.";
- 
-+#endif
-+
-+// Chrome OS -------------------------------------------------------------------
-+
-+#if defined(OS_CHROMEOS)
-+
- const char kAllowDisableMouseAccelerationName[] =
-     "Allow disabling mouse acceleration";
- const char kAllowDisableMouseAccelerationDescription[] =
-diff -up chromium-88.0.4324.11/chrome/browser/flag_descriptions.h.accel-mjpeg chromium-88.0.4324.11/chrome/browser/flag_descriptions.h
--- chromium-88.0.4324.11/chrome/browser/flag_descriptions.h.accel-mjpeg	2020-11-30 16:14:32.394366389 -0500
-+++ chromium-88.0.4324.11/chrome/browser/flag_descriptions.h	2020-11-30 16:22:13.831601058 -0500
-@@ -2068,13 +2068,19 @@ extern const char kVideoToolboxVp9Decodi
- 
- #endif  // defined(OS_MAC)
- 
-// Chrome OS ------------------------------------------------------------------
-+// Chrome OS and Linux --------------------------------------------------------
- 
-#if defined(OS_CHROMEOS)
-+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID))
- 
- extern const char kAcceleratedMjpegDecodeName[];
- extern const char kAcceleratedMjpegDecodeDescription[];
- 
-+#endif
-+
-+// Chrome OS ------------------------------------------------------------------
-+
-+#if defined(OS_CHROMEOS)
-+
- extern const char kAllowDisableMouseAccelerationName[];
- extern const char kAllowDisableMouseAccelerationDescription[];
- 
--- a/chromium-89-AXTreeSerializer-include.patch
+++ b/chromium-89-AXTreeSerializer-include.patch
@ -0,0 +1,25 @@
+From c06ddc4935bf1394812c011ce5d93898ccc8a53a Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Tue, 09 Feb 2021 19:22:57 +0000
+Subject: [PATCH] IWYU: add ctime for std::time
+
+Bug: None
+Change-Id: I8bdae43209984242b9f5e538d74ece4409b65e3c
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2679610
+Reviewed-by: Katie Dektar <katie@chromium.org>
+Commit-Queue: Katie Dektar <katie@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#852287}
+---
+
+diff --git a/ui/accessibility/ax_tree_serializer.h b/ui/accessibility/ax_tree_serializer.h
+index ddbbdcd..1790e3b 100644
+--- a/ui/accessibility/ax_tree_serializer.h
+++ b/ui/accessibility/ax_tree_serializer.h
+@@ -8,6 +8,7 @@
+ #include <stddef.h>
+ #include <stdint.h>
+ 
+#include <ctime>
+ #include <ostream>
+ #include <unordered_map>
+ #include <unordered_set>
--- a/chromium-89-dawn-include.patch
+++ b/chromium-89-dawn-include.patch
@ -0,0 +1,28 @@
+From 5a56bfe8d281250a1deee0d116a9fcde65b9c29a Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Fri, 15 Jan 2021 18:37:05 +0000
+Subject: [PATCH] IWYU: add various missing includes
+
+std::weak_ptr and std::shared_ptr require map
+*int*_t types require cstdint
+---
+ third_party/dawn/src/dawn_wire/client/Device.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/third_party/dawn/src/dawn_wire/client/Device.h b/third_party/dawn/src/dawn_wire/client/Device.h
+index 3f16700..1082549 100644
+--- a/third_party/dawn/src/dawn_wire/client/Device.h
+++ b/third_party/dawn/src/dawn_wire/client/Device.h
+@@ -22,7 +22,9 @@
+ #include "dawn_wire/client/ApiObjects_autogen.h"
+ #include "dawn_wire/client/ObjectBase.h"
+ 
+#include <cstdint>
+ #include <map>
+#include <memory>
+ 
+ namespace dawn_wire { namespace client {
+ 
+-- 
+2.26.2
+
--- a/chromium-89-quiche-dcheck.patch
+++ b/chromium-89-quiche-dcheck.patch
@ -0,0 +1,29 @@
+From 7cd4eab0bfca6192f14d6143410e1ae774eb1c29 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Thu, 31 Dec 2020 11:57:22 +0000
+Subject: [PATCH] GCC: do not pass unique_ptr to DCHECK_NE, but the actual
+ pointer
+
+DCHECK_NE comparison requires CheckOpValueStr to be defined for the
+type, or providing an output stream operator. A unique_ptr does not
+provide any. USE DCHECK instead.
+---
+ net/third_party/quiche/src/quic/core/quic_path_validator.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/net/third_party/quiche/src/quic/core/quic_path_validator.cc b/net/third_party/quiche/src/quic/core/quic_path_validator.cc
+index 0722216..fb2aeaf 100644
+--- a/net/third_party/quiche/src/quic/core/quic_path_validator.cc
+++ b/net/third_party/quiche/src/quic/core/quic_path_validator.cc
+@@ -68,7 +68,7 @@ void QuicPathValidator::OnPathResponse(const QuicPathFrameBuffer& probing_data,
+ void QuicPathValidator::StartPathValidation(
+     std::unique_ptr<QuicPathValidationContext> context,
+     std::unique_ptr<ResultDelegate> result_delegate) {
+-  DCHECK_NE(nullptr, context);
+  DCHECK(context);
+   QUIC_DLOG(INFO) << "Start validating path " << *context
+                   << " via writer: " << context->WriterToUse();
+   if (path_context_ != nullptr) {
+-- 
+2.26.2
+
--- a/chromium-89-quiche-private.patch
+++ b/chromium-89-quiche-private.patch
@ -0,0 +1,26 @@
+From 1ee06c3678a85d158eb82d4af438d1e43a4c814e Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Sun, 6 Dec 2020 16:14:17 +0000
+Subject: [PATCH] GCC: change make_visitor visibility to public
+
+GCC complains that make_visitor is used in private context from
+inner Iterator class.
+---
+ net/third_party/quiche/src/quic/core/quic_interval_set.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/net/third_party/quiche/src/quic/core/quic_interval_set.h b/net/third_party/quiche/src/quic/core/quic_interval_set.h
+index af64e29..7ee8978 100644
+--- a/net/third_party/quiche/src/quic/core/quic_interval_set.h
+++ b/net/third_party/quiche/src/quic/core/quic_interval_set.h
+@@ -1874,7 +1874,6 @@ class QUIC_NO_EXPORT QuicIntervalSet {
+     return absl::visit([&](auto& s) { return s.Contains(min, max); }, qiset_);
+   }
+ 
+- private:
+   template <class A, class B, class C>
+   struct overloader : A, B, C {
+     overloader(A a, B b, C c) : A(a), B(b), C(c) {}
+-- 
+2.26.2
+
--- a/chromium-89-skia-CropRect.patch
+++ b/chromium-89-skia-CropRect.patch
@ -0,0 +1,38 @@
+diff --git a/third_party/skia/include/effects/SkImageFilters.h b/third_party/skia/include/effects/SkImageFilters.h
+index 04cce0a..d06b007 100644
+--- a/third_party/skia/include/effects/SkImageFilters.h
+++ b/third_party/skia/include/effects/SkImageFilters.h
+@@ -23,6 +23,9 @@ class SkColorFilter;
+ class SkPaint;
+ class SkRegion;
+ 
+constexpr SkRect kNoCropRect = {SK_ScalarNegativeInfinity, SK_ScalarNegativeInfinity,
+                                SK_ScalarInfinity, SK_ScalarInfinity};
+
+ // A set of factory functions providing useful SkImageFilter effects. For image filters that take an
+ // input filter, providing nullptr means it will automatically use the dynamic source image. This
+ // source depends on how the filter is applied, but is either the contents of a saved layer when
+@@ -33,8 +36,6 @@ public:
+     // to those types as a crop rect for the image filter factories. It's not intended to be used
+     // directly.
+     struct CropRect {
+-        static constexpr SkRect kNoCropRect = {SK_ScalarNegativeInfinity, SK_ScalarNegativeInfinity,
+-                                               SK_ScalarInfinity, SK_ScalarInfinity};
+         CropRect() : fCropRect(kNoCropRect) {}
+         // Intentionally not explicit so callers don't have to use this type but can use SkIRect or
+         // SkRect as desired.
+diff --git a/third_party/skia/src/effects/imagefilters/SkImageFilters.cpp b/third_party/skia/src/effects/imagefilters/SkImageFilters.cpp
+index 5290b00..fb97fc1 100644
+--- a/third_party/skia/src/effects/imagefilters/SkImageFilters.cpp
+++ b/third_party/skia/src/effects/imagefilters/SkImageFilters.cpp
+@@ -47,10 +47,6 @@ static SkImageFilter::CropRect to_legacy_crop_rect(const SkImageFilters::CropRec
+                                          : SkImageFilter::CropRect(SkRect::MakeEmpty(), 0x0);
+ }
+ 
+-// Allow kNoCropRect to be referenced (for certain builds, e.g. macOS libFuzzer chromium target,
+-// see crbug.com/1139725)
+-constexpr SkRect SkImageFilters::CropRect::kNoCropRect;
+-
+ void SkImageFilters::RegisterFlattenables() {
+     SkAlphaThresholdFilter::RegisterFlattenables();
+     SkArithmeticImageFilter::RegisterFlattenables();
--- a/chromium-89.0.4389.72-enable-hardware-accelerated-mjpeg.patch
+++ b/chromium-89.0.4389.72-enable-hardware-accelerated-mjpeg.patch
@ -0,0 +1,66 @@
+diff -up chromium-89.0.4389.72/chrome/browser/about_flags.cc.accel-mjpeg chromium-89.0.4389.72/chrome/browser/about_flags.cc
+--- chromium-89.0.4389.72/chrome/browser/about_flags.cc.accel-mjpeg	2021-03-04 14:02:26.379527446 -0500
+++ chromium-89.0.4389.72/chrome/browser/about_flags.cc	2021-03-04 14:06:40.208830372 -0500
+@@ -3526,12 +3526,12 @@ const FeatureEntry kFeatureEntries[] = {
+      flag_descriptions::kWebXrForceRuntimeDescription, kOsDesktop,
+      MULTI_VALUE_TYPE(kWebXrForceRuntimeChoices)},
+ #endif  // ENABLE_VR
+-#if BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_LINUX)
+     {"disable-accelerated-mjpeg-decode",
+      flag_descriptions::kAcceleratedMjpegDecodeName,
+-     flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS,
+     flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS | kOsLinux,
+      SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)},
+-#endif  // BUILDFLAG(IS_CHROMEOS_ASH)
+#endif  // BUILDFLAG(IS_CHROMEOS_ASH) || OS_LINUX
+     {"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName,
+      flag_descriptions::kSystemKeyboardLockDescription, kOsDesktop,
+      FEATURE_VALUE_TYPE(features::kSystemKeyboardLock)},
+diff -up chromium-89.0.4389.72/chrome/browser/flag_descriptions.cc.accel-mjpeg chromium-89.0.4389.72/chrome/browser/flag_descriptions.cc
+--- chromium-89.0.4389.72/chrome/browser/flag_descriptions.cc.accel-mjpeg	2021-03-02 12:45:03.000000000 -0500
+++ chromium-89.0.4389.72/chrome/browser/flag_descriptions.cc	2021-03-04 14:07:56.648199844 -0500
+@@ -3704,12 +3704,22 @@ const char kAccountManagementFlowsV2Desc
+     "Settings. "
+     "See go/betterAM";
+ 
+#endif
+
+#if BUILDFLAG(IS_CHROMEOS_ASH) || (defined(OS_LINUX) && !defined(OS_ANDROID))
+
+ const char kAcceleratedMjpegDecodeName[] =
+     "Hardware-accelerated mjpeg decode for captured frame";
+ const char kAcceleratedMjpegDecodeDescription[] =
+     "Enable hardware-accelerated mjpeg decode for captured frame where "
+     "available.";
+ 
+#endif
+
+// Chrome OS -------------------------------------------------------------------
+
+#if defined(OS_CHROMEOS)
+
+ const char kAllowDisableMouseAccelerationName[] =
+     "Allow disabling mouse acceleration";
+ const char kAllowDisableMouseAccelerationDescription[] =
+diff -up chromium-89.0.4389.72/chrome/browser/flag_descriptions.h.accel-mjpeg chromium-89.0.4389.72/chrome/browser/flag_descriptions.h
+--- chromium-89.0.4389.72/chrome/browser/flag_descriptions.h.accel-mjpeg	2021-03-04 14:02:26.381527456 -0500
+++ chromium-89.0.4389.72/chrome/browser/flag_descriptions.h	2021-03-04 14:09:10.842558552 -0500
+@@ -2138,9 +2138,17 @@ extern const char kVideoToolboxVp9Decodi
+ extern const char kAccountManagementFlowsV2Name[];
+ extern const char kAccountManagementFlowsV2Description[];
+ 
+#endif
+
+#if BUILDFLAG(IS_CHROMEOS_ASH) || (defined(OS_LINUX) && !defined(OS_ANDROID))
+
+ extern const char kAcceleratedMjpegDecodeName[];
+ extern const char kAcceleratedMjpegDecodeDescription[];
+ 
+#endif
+
+#if BUILDFLAG(IS_CHROMEOS_ASH)
+
+ extern const char kAllowDisableMouseAccelerationName[];
+ extern const char kAllowDisableMouseAccelerationDescription[];
+ 
--- a/chromium-89.0.4389.72-initial_prefs-etc-path.patch
+++ b/chromium-89.0.4389.72-initial_prefs-etc-path.patch
@ -0,0 +1,15 @@
+diff -up chromium-89.0.4389.72/chrome/browser/first_run/first_run_internal_linux.cc.etc chromium-89.0.4389.72/chrome/browser/first_run/first_run_internal_linux.cc
+--- chromium-89.0.4389.72/chrome/browser/first_run/first_run_internal_linux.cc.etc	2021-03-04 11:12:14.394002900 -0500
+++ chromium-89.0.4389.72/chrome/browser/first_run/first_run_internal_linux.cc	2021-03-04 11:13:00.909220323 -0500
+@@ -19,9 +19,9 @@ bool IsOrganicFirstRun() {
+ 
+ base::FilePath InitialPrefsPath() {
+   // The standard location of the initial prefs is next to the chrome binary.
+  // ...but we patch it to use /etc/chromium
+   base::FilePath initial_prefs;
+-  if (!base::PathService::Get(base::DIR_EXE, &initial_prefs))
+-    return base::FilePath();
+  initial_prefs = base::FilePath("/etc/chromium");
+   return initial_prefs.AppendASCII(installer::kLegacyInitialPrefs);
+ }
+ 
--- a/chromium-89.0.4389.72-missing-cstring-header.patch
+++ b/chromium-89.0.4389.72-missing-cstring-header.patch
@ -0,0 +1,34 @@
+diff -up chromium-89.0.4389.72/third_party/webrtc/audio/utility/channel_mixer.cc.missing-cstring chromium-89.0.4389.72/third_party/webrtc/audio/utility/channel_mixer.cc
+--- chromium-89.0.4389.72/third_party/webrtc/audio/utility/channel_mixer.cc.missing-cstring	2021-03-02 12:48:16.000000000 -0500
+++ chromium-89.0.4389.72/third_party/webrtc/audio/utility/channel_mixer.cc	2021-03-04 13:31:42.894817353 -0500
+@@ -8,6 +8,8 @@
+  *  be found in the AUTHORS file in the root of the source tree.
+  */
+ 
+#include <cstring>
+
+ #include "audio/utility/channel_mixer.h"
+ 
+ #include "audio/utility/channel_mixing_matrix.h"
+diff -up chromium-89.0.4389.72/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc.missing-cstring chromium-89.0.4389.72/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
+--- chromium-89.0.4389.72/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc.missing-cstring	2021-03-04 13:31:42.895817359 -0500
+++ chromium-89.0.4389.72/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc	2021-03-04 13:45:27.795162431 -0500
+@@ -23,6 +23,7 @@
+ #include <sys/mman.h>
+ #include <sys/syscall.h>
+ 
+#include <cstring>
+ #include <memory>
+ #include <utility>
+ 
+diff -up chromium-89.0.4389.72/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc.missing-cstring chromium-89.0.4389.72/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc
+--- chromium-89.0.4389.72/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc.missing-cstring	2021-03-02 12:48:17.000000000 -0500
+++ chromium-89.0.4389.72/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc	2021-03-04 13:31:42.895817359 -0500
+@@ -10,6 +10,7 @@
+ 
+ #include "modules/video_coding/utility/ivf_file_reader.h"
+ 
+#include <cstring>
+ #include <string>
+ #include <vector>
+ 
--- a/chromium-89.0.4389.72-norar.patch
+++ b/chromium-89.0.4389.72-norar.patch
@ -0,0 +1,90 @@
+diff -up chromium-89.0.4389.72/chrome/common/safe_browsing/BUILD.gn.nounrar chromium-89.0.4389.72/chrome/common/safe_browsing/BUILD.gn
+--- chromium-89.0.4389.72/chrome/common/safe_browsing/BUILD.gn.nounrar	2021-03-02 12:45:06.000000000 -0500
+++ chromium-89.0.4389.72/chrome/common/safe_browsing/BUILD.gn	2021-03-04 11:56:21.676563769 -0500
+@@ -43,39 +43,6 @@ if (safe_browsing_mode == 1) {
+     public_deps = [ "//components/safe_browsing/core:csd_proto" ]
+   }
+ 
+-  source_set("rar_analyzer") {
+-    sources = [
+-      "rar_analyzer.cc",
+-      "rar_analyzer.h",
+-    ]
+-
+-    deps = [
+-      ":archive_analyzer_results",
+-      ":download_type_util",
+-      "//base",
+-      "//base:i18n",
+-      "//components/safe_browsing/core:features",
+-      "//components/safe_browsing/core:file_type_policies",
+-      "//third_party/unrar:unrar",
+-    ]
+-
+-    defines = [
+-      "_FILE_OFFSET_BITS=64",
+-      "LARGEFILE_SOURCE",
+-      "RAR_SMP",
+-      "SILENT",
+-
+-      # The following is set to disable certain macro definitions in the unrar
+-      # source code.
+-      "CHROMIUM_UNRAR",
+-
+-      # Disables exceptions in unrar, replaces them with process termination.
+-      "UNRAR_NO_EXCEPTIONS",
+-    ]
+-
+-    public_deps = [ "//components/safe_browsing/core:csd_proto" ]
+-  }
+-
+   if (is_mac) {
+     source_set("disk_image_type_sniffer_mac") {
+       sources = [
+@@ -145,7 +112,6 @@ source_set("safe_browsing") {
+       ":archive_analyzer_results",
+       ":binary_feature_extractor",
+       ":download_type_util",
+-      ":rar_analyzer",
+       "//components/safe_browsing/core:features",
+     ]
+ 
+diff -up chromium-89.0.4389.72/chrome/common/safe_browsing/DEPS.nounrar chromium-89.0.4389.72/chrome/common/safe_browsing/DEPS
+--- chromium-89.0.4389.72/chrome/common/safe_browsing/DEPS.nounrar	2021-03-02 12:45:06.000000000 -0500
+++ chromium-89.0.4389.72/chrome/common/safe_browsing/DEPS	2021-03-04 11:56:21.676563769 -0500
+@@ -1,6 +1,5 @@
+ include_rules = [
+   "+components/safe_browsing",
+   "+third_party/protobuf",
+-  "+third_party/unrar",
+   "+third_party/zlib",
+ ]
+diff -up chromium-89.0.4389.72/chrome/services/file_util/BUILD.gn.nounrar chromium-89.0.4389.72/chrome/services/file_util/BUILD.gn
+--- chromium-89.0.4389.72/chrome/services/file_util/BUILD.gn.nounrar	2021-03-04 11:56:21.676563769 -0500
+++ chromium-89.0.4389.72/chrome/services/file_util/BUILD.gn	2021-03-04 11:57:38.583933453 -0500
+@@ -17,7 +17,6 @@ source_set("file_util") {
+     "//build:chromeos_buildflags",
+     "//chrome/common/safe_browsing",
+     "//chrome/common/safe_browsing:archive_analyzer_results",
+-    "//chrome/common/safe_browsing:rar_analyzer",
+     "//components/safe_browsing:buildflags",
+     "//mojo/public/cpp/bindings",
+   ]
+diff -up chromium-89.0.4389.72/chrome/services/file_util/safe_archive_analyzer.cc.nounrar chromium-89.0.4389.72/chrome/services/file_util/safe_archive_analyzer.cc
+--- chromium-89.0.4389.72/chrome/services/file_util/safe_archive_analyzer.cc.nounrar	2021-03-02 12:45:06.000000000 -0500
+++ chromium-89.0.4389.72/chrome/services/file_util/safe_archive_analyzer.cc	2021-03-04 11:56:21.677563774 -0500
+@@ -45,10 +45,14 @@ void SafeArchiveAnalyzer::AnalyzeDmgFile
+ void SafeArchiveAnalyzer::AnalyzeRarFile(base::File rar_file,
+                                          base::File temporary_file,
+                                          AnalyzeRarFileCallback callback) {
+#if 0
+   DCHECK(rar_file.IsValid());
+ 
+   safe_browsing::ArchiveAnalyzerResults results;
+   safe_browsing::rar_analyzer::AnalyzeRarFile(
+       std::move(rar_file), std::move(temporary_file), &results);
+   std::move(callback).Run(results);
+#else
+  NOTREACHED();
+#endif
+ }
--- a/chromium-89.0.4389.72-widevine-other-locations.patch
+++ b/chromium-89.0.4389.72-widevine-other-locations.patch
@ -1,7 +1,7 @@
-diff -up chromium-86.0.4240.75/chrome/common/chrome_paths.cc.widevine-other-locations chromium-86.0.4240.75/chrome/common/chrome_paths.cc
--- chromium-86.0.4240.75/chrome/common/chrome_paths.cc.widevine-other-locations	2020-10-14 14:47:36.000823668 -0400
-+++ chromium-86.0.4240.75/chrome/common/chrome_paths.cc	2020-10-14 14:54:49.347207638 -0400
-@@ -379,6 +379,16 @@ bool PathProvider(int key, base::FilePat
+diff -up chromium-89.0.4389.72/chrome/common/chrome_paths.cc.widevine-other-locations chromium-89.0.4389.72/chrome/common/chrome_paths.cc
+--- chromium-89.0.4389.72/chrome/common/chrome_paths.cc.widevine-other-locations	2021-03-04 12:04:50.005010200 -0500
+++ chromium-89.0.4389.72/chrome/common/chrome_paths.cc	2021-03-04 12:38:54.650855614 -0500
+@@ -339,6 +339,16 @@ bool PathProvider(int key, base::FilePat
 #if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && \
     BUILDFLAG(BUNDLE_WIDEVINE_CDM)
     case chrome::DIR_BUNDLED_WIDEVINE_CDM:
@ -17,4 +17,4 @@ diff -up chromium-86.0.4240.75/chrome/common/chrome_paths.cc.widevine-other-loca
 +      }
       if (!GetComponentDirectory(&cur))
         return false;
- #if !defined(OS_CHROMEOS)
+ #if !BUILDFLAG(IS_CHROMEOS_ASH)
--- a/chromium.spec
+++ b/chromium.spec
@ -208,15 +208,15 @@ BuildRequires:  libicu-devel >= 5.4
 %global chromoting_client_id %nil
 %endif

-%global majorversion 88
+%global majorversion 89

 %if %{freeworld}
 Name:		chromium%{chromium_channel}%{nsuffix}
 %else
 Name:		chromium%{chromium_channel}
 %endif
-Version:	%{majorversion}.0.4324.182
-Release:	2%{?dist}
+Version:	%{majorversion}.0.4389.72
+Release:	1%{?dist}
 %if %{?freeworld}
 %if %{?shared}
 # chromium-libs-media-freeworld
@ -234,7 +234,7 @@ License:	BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and Open
 ### Chromium Fedora Patches ###
 Patch0:		chromium-70.0.3538.67-sandbox-pie.patch
 # Use /etc/chromium for initial_prefs
-Patch1:		chromium-86.0.4240.75-initial_prefs-etc-path.patch
+Patch1:		chromium-89.0.4389.72-initial_prefs-etc-path.patch
 # Use gn system files
 Patch2:		chromium-67.0.3396.62-gn-system.patch
 # Do not prefix libpng functions
@ -244,7 +244,7 @@ Patch4:		chromium-60.0.3112.78-jpeg-nomangle.patch
 # Do not mangle zlib
 Patch5:		chromium-77.0.3865.75-no-zlib-mangle.patch
 # Do not use unrar code, it is non-free
-Patch6:		chromium-88.0.4324.11-norar.patch
+Patch6:		chromium-89.0.4389.72-norar.patch
 # Use Gentoo's Widevine hack
 # https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/chromium-widevine-r3.patch
 Patch7:		chromium-71.0.3578.98-widevine-r3.patch
@ -253,43 +253,39 @@ Patch8:		chromium-83.0.4103.61-disable-fontconfig-cache-magic.patch
 # drop rsp clobber, which breaks gcc9 (thanks to Jeff Law)
 Patch9:	chromium-78.0.3904.70-gcc9-drop-rsp-clobber.patch
 # Try to load widevine from other places
-Patch10:	chromium-86.0.4240.75-widevine-other-locations.patch
+Patch10:	chromium-89.0.4389.72-widevine-other-locations.patch
 # Try to fix version.py for Rawhide
 Patch11:	chromium-71.0.3578.98-py2-bootstrap.patch
 # Add "Fedora" to the user agent string
 Patch12:	chromium-86.0.4240.75-fedora-user-agent.patch

-# rename function to avoid conflict with rawhide glibc "gettid()"
-Patch50:	chromium-75.0.3770.80-grpc-gettid-fix.patch
 # Needs to be submitted..
 Patch51:	chromium-76.0.3809.100-gcc-remoting-constexpr.patch
 # https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/chromium-unbundle-zlib.patch
 Patch52:	chromium-81.0.4044.92-unbundle-zlib.patch
 # Needs to be submitted..
 Patch53:	chromium-77.0.3865.75-gcc-include-memory.patch
-# https://github.com/stha09/chromium-patches/blob/master/chromium-79-gcc-protobuf-alignas.patch
-Patch54:	chromium-79-gcc-protobuf-alignas.patch
 # https://github.com/stha09/chromium-patches/blob/master/chromium-78-protobuf-RepeatedPtrField-export.patch
 Patch55:	chromium-78-protobuf-RepeatedPtrField-export.patch
 # ../../third_party/perfetto/include/perfetto/base/task_runner.h:48:55: error: 'uint32_t' has not been declared
 Patch56:	chromium-80.0.3987.87-missing-cstdint-header.patch
 # Missing <cstring> (thanks c++17)
-Patch57:	chromium-80.0.3987.106-missing-cstring-header.patch
+Patch57:	chromium-89.0.4389.72-missing-cstring-header.patch
 # prepare for using system ffmpeg (clean)
 # http://svnweb.mageia.org/packages/cauldron/chromium-browser-stable/current/SOURCES/chromium-53-ffmpeg-no-deprecation-errors.patch?view=markup
 Patch58:	chromium-53-ffmpeg-no-deprecation-errors.patch
-# https://github.com/stha09/chromium-patches/blob/master/chromium-84-blink-disable-clang-format.patch
-Patch59:	chromium-84-blink-disable-clang-format.patch
-# https://github.com/stha09/chromium-patches/blob/master/chromium-fix-char_traits.patch
-Patch60:	chromium-fix-char_traits.patch
-# https://github.com/stha09/chromium-patches/blob/master/chromium-87-CursorFactory-include.patch
-Patch61:	chromium-87-CursorFactory-include.patch
-# https://github.com/stha09/chromium-patches/blob/master/chromium-87-openscreen-include.patch
-Patch62:	chromium-87-openscreen-include.patch
-# https://github.com/stha09/chromium-patches/blob/master/chromium-88-AXTreeFormatter-include.patch
-Patch63:	chromium-88-AXTreeFormatter-include.patch
-# https://github.com/stha09/chromium-patches/blob/master/chromium-88-vaapi-attribute.patch
-Patch64:	chromium-88-vaapi-attribute.patch
+# https://github.com/stha09/chromium-patches/blob/chromium-89-patchset-7/chromium-89-dawn-include.patch
+Patch60:	chromium-89-dawn-include.patch
+# https://github.com/stha09/chromium-patches/blob/chromium-89-patchset-7/chromium-89-quiche-dcheck.patch
+Patch61:	chromium-89-quiche-dcheck.patch
+# https://github.com/stha09/chromium-patches/blob/chromium-89-patchset-7/chromium-89-quiche-private.patch
+Patch62:	chromium-89-quiche-private.patch
+# https://github.com/stha09/chromium-patches/blob/chromium-89-patchset-7/chromium-89-skia-CropRect.patch
+Patch63:	chromium-89-skia-CropRect.patch
+# https://github.com/stha09/chromium-patches/blob/chromium-89-patchset-7/chromium-89-AXTreeSerializer-include.patch
+Patch64:	chromium-89-AXTreeSerializer-include.patch
+
+
 # Silence GCC warnings during gn compile
 Patch65:	chromium-84.0.4147.105-gn-gcc-cleanup.patch
 # Fix missing cstring in remoting code
@ -298,18 +294,6 @@ Patch66:	chromium-84.0.4147.125-remoting-cstring.patch
 Patch67:	chromium-84.0.4147.125-i686-fix_textrels.patch
 # Work around binutils bug in aarch64 (F33+)
 Patch68:	chromium-84.0.4147.125-aarch64-clearkeycdm-binutils-workaround.patch
-# https://github.com/stha09/chromium-patches/blob/master/chromium-88-BookmarkModelObserver-include.patch
-Patch69:	chromium-88-BookmarkModelObserver-include.patch
-# https://github.com/stha09/chromium-patches/blob/master/chromium-88-CompositorFrameReporter-dcheck.patch
-Patch70:	chromium-88-CompositorFrameReporter-dcheck.patch
-# https://github.com/stha09/chromium-patches/blob/master/chromium-88-dawn-static.patch
-Patch71:	chromium-88-dawn-static.patch
-# https://github.com/stha09/chromium-patches/blob/master/chromium-88-federated_learning-include.patch
-Patch72:	chromium-88-federated_learning-include.patch
-# https://github.com/stha09/chromium-patches/blob/master/chromium-88-ityp-include.patch
-Patch73:	chromium-88-ityp-include.patch
-# https://github.com/stha09/chromium-patches/blob/master/chromium-88-StringPool-include.patch
-Patch74:	chromium-88-StringPool-include.patch
 # Fix sandbox code to properly handle the new way that glibc handles fstat in Fedora 34+
 # Thanks to Kevin Kofler for the fix.
 Patch75:	chromium-88.0.4324.96-fstatfix.patch
@ -341,7 +325,7 @@ Patch109:	chromium-87.0.4280.66-el7-no-sys-random.patch

 # VAAPI
 # Upstream turned VAAPI on in Linux in 86
-Patch202:	chromium-88.0.4324.11-enable-hardware-accelerated-mjpeg.patch
+Patch202:	chromium-89.0.4389.72-enable-hardware-accelerated-mjpeg.patch
 Patch203:	chromium-86.0.4240.75-vaapi-i686-fpermissive.patch
 Patch205:	chromium-86.0.4240.75-fix-vaapi-on-intel.patch

@ -904,7 +888,8 @@ udev.
 %patch1 -p1 -b .etc
 %patch2 -p1 -b .gnsystem
 %patch3 -p1 -b .nolibpngprefix
-%patch4 -p1 -b .nolibjpegmangle
+# Upstream accidentally made the same change in 89, but they've already reverted it for 90+ so this patch will return
+# %%patch4 -p1 -b .nolibjpegmangle
 %patch5 -p1 -b .nozlibmangle
 %patch6 -p1 -b .nounrar
 %patch7 -p1 -b .widevine-hack
@ -914,33 +899,24 @@ udev.
 %patch11 -p1 -b .py2

 # Short term fixes (usually gcc and backports)
-%patch50 -p1 -b .gettid-fix
 %patch51 -p1 -b .gcc-remoting-constexpr
 %if 0%{?fedora} || 0%{?rhel} >= 8
 %patch52 -p1 -b .unbundle-zlib
 %endif
 %patch53 -p1 -b .gcc-include-memory
-%patch54 -p1 -b .base-gcc-no-alignas
 %patch55 -p1 -b .protobuf-export
 %patch56 -p1 -b .missing-cstdint
 %patch57 -p1 -b .missing-cstring
 %patch58 -p1 -b .ffmpeg-deprecations
-%patch59 -p1 -b .blink-disable-clang-format
-%patch60 -p1 -b .fix-char_traits
-%patch61 -p1 -b .CursorFactory-include
-%patch62 -p1 -b .openscreen-include
-%patch63 -p1 -b .AXTreeFormatter-include
-%patch64 -p1 -b .vaapi-attribute
+%patch60 -p1 -b .dawn-include
+%patch61 -p1 -b .quiche-dcheck
+%patch62 -p1 -b .quiche-private
+%patch63 -p1 -b .skia-CropRect
+%patch64 -p1 -b .AXTreeSerializer-include
 %patch65 -p1 -b .gn-gcc-cleanup
 %patch66 -p1 -b .remoting-cstring
 %patch67 -p1 -b .i686-textrels
 %patch68 -p1 -b .aarch64-clearkeycdm-binutils-workaround
-%patch69 -p1 -b .BookmarkModelObserver-include
-%patch70 -p1 -b .CompositorFrameReporter-dcheck
-%patch71 -p1 -b .dawn-static
-%patch72 -p1 -b .federated_learning-include
-%patch73 -p1 -b .ityp-include
-%patch74 -p1 -b .StringPool-include
 %patch75 -p1 -b .fstatfix
 %if 0%{?fedora} >= 35
 %patch76 -p1 -b .sigstkszfix
@ -1992,6 +1968,9 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt


 %changelog
+* Thu Mar  4 2021 Tom Callaway <spot@fedoraproject.org> - 89.0.4389.72-1
+- update to 89.0.4389.72
+
 * Thu Feb 25 2021 Tom Callaway <spot@fedoraproject.org> - 88.0.4234.182-2
 - fix swiftshader symbols in libEGL/libGLESv2 with gcc

--- a/clean_ffmpeg.sh
+++ b/clean_ffmpeg.sh
@ -107,7 +107,6 @@ header_files="	libavcodec/x86/inline_asm.h \
 		libavcodec/mpeg12vlc.h \
 		libavcodec/mpegaudio.h \
 		libavcodec/mpegaudiodecheader.h \
-		libavcodec/mpegaudiodectab.h \
 		libavcodec/mpegaudiodsp.h \
 		libavcodec/mpegaudio_tablegen.h \
 		libavcodec/mpegpicture.h \