Packman Build Service PMBS

chromium-ffmpeg-extra.changes Changed

@@ -1,4 +1,323 @@
 -------------------------------------------------------------------
+Sun Apr 24 05:23:26 UTC 2022 - Carsten Ziepke <kieltux@gmail.com>
+
+- Rebase chromium 100.0.4896.127 for use as chromium-ffmpeg-extra
+
+-------------------------------------------------------------------
+Fri Apr 15 07:29:35 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- Chromium 100.0.4896.127 (boo#1198509)
+  * CVE-2022-1364: Type Confusion in V8
+  * Various fixes from internal audits, fuzzing and other initiatives
+
+-------------------------------------------------------------------
+Tue Apr 12 05:02:45 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- Chromium 100.0.4896.88 (boo#1198361)
+  * CVE-2022-1305: Use after free in storage
+  * CVE-2022-1306: Inappropriate implementation in compositing
+  * CVE-2022-1307: Inappropriate implementation in full screen
+  * CVE-2022-1308: Use after free in BFCache
+  * CVE-2022-1309: Insufficient policy enforcement in developer tools
+  * CVE-2022-1310: Use after free in regular expressions
+  * CVE-2022-1311: Use after free in Chrome OS shell
+  * CVE-2022-1312: Use after free in storage
+  * CVE-2022-1313: Use after free in tab groups
+  * CVE-2022-1314: Type Confusion in V8
+  * Various fixes from internal audits, fuzzing and other initiatives
+
+-------------------------------------------------------------------
+Sun Apr 10 13:52:31 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>
+
+- Patches for GCC 12:
+  * chromium-fix-swiftshader-template.patch
+  * chromium-missing-include-tuple.patch
+  * chromium-webrtc-stats-missing-vector.patch
+
+-------------------------------------------------------------------
+Tue Apr  5 02:11:03 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- Chromium 100.0.4896.75:
+  * CVE-2022-1232: Type Confusion in V8 (boo#1198053)
+
+-------------------------------------------------------------------
+Wed Mar 30 16:25:44 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>
+
+- Chromium 100.0.4896.60 (boo#1197680)
+  * CVE-2022-1125: Use after free in Portals
+  * CVE-2022-1127: Use after free in QR Code Generator
+  * CVE-2022-1128: Inappropriate implementation in Web Share API
+  * CVE-2022-1129: Inappropriate implementation in Full Screen Mode
+  * CVE-2022-1130: Insufficient validation of untrusted input in WebOTP
+  * CVE-2022-1131: Use after free in Cast UI
+  * CVE-2022-1132: Inappropriate implementation in Virtual Keyboard
+  * CVE-2022-1133: Use after free in WebRTC
+  * CVE-2022-1134: Type Confusion in V8
+  * CVE-2022-1135: Use after free in Shopping Cart
+  * CVE-2022-1136: Use after free in Tab Strip
+  * CVE-2022-1137: Inappropriate implementation in Extensions
+  * CVE-2022-1138: Inappropriate implementation in Web Cursor
+  * CVE-2022-1139: Inappropriate implementation in Background Fetch API
+  * CVE-2022-1141: Use after free in File Manager
+  * CVE-2022-1142: Heap buffer overflow in WebUI
+  * CVE-2022-1143: Heap buffer overflow in WebUI
+  * CVE-2022-1144: Use after free in WebUI
+  * CVE-2022-1145: Use after free in Extensions
+  * CVE-2022-1146: Inappropriate implementation in Resource Timing
+- Added patches:
+  * chromium-100-compiler.patch
+  * chromium-100-GLImplementationParts-constexpr.patch
+  * chromium-100-InMilliseconds-constexpr.patch
+  * chromium-100-SCTHashdanceMetadata-move.patch
+  * chromium-100-macro-typo.patch
+- Removed patches:
+  * chromium-98-compiler.patch
+  * chromium-86-nearby-explicit.patch
+  * chromium-glibc-2.34.patch
+  * chromium-v8-missing-utility-include.patch
+  * chromium-99-AutofillAssistantModelExecutor-NoDestructor.patch
+
+-------------------------------------------------------------------
+Tue Mar 29 09:23:28 UTC 2022 - Andreas Schwab <schwab@suse.de>
+
+- Update disk constraints
+
+-------------------------------------------------------------------
+Sat Mar 26 15:10:15 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- Chromium 99.0.4844.84:
+  * CVE-2022-1096: Type Confusion in V8 (boo#1197552)
+
+-------------------------------------------------------------------
+Mon Mar 21 05:07:25 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- Chromium 99.0.4844.82:
+  * Fix potential problem in Hangouts (boo#1197332)
+
+-------------------------------------------------------------------
+Wed Mar 16 09:36:49 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- Chromium 99.0.4844.74 (boo#1197163)
+  * CVE-2022-0971: Use after free in Blink Layout
+  * CVE-2022-0972: Use after free in Extensions
+  * CVE-2022-0973: Use after free in Safe Browsing
+  * CVE-2022-0974: Use after free in Splitscreen
+  * CVE-2022-0975: Use after free in ANGLE
+  * CVE-2022-0976: Heap buffer overflow in GPU
+  * CVE-2022-0977: Use after free in Browser UI
+  * CVE-2022-0978: Use after free in ANGLE
+  * CVE-2022-0979: Use after free in Safe Browsing
+  * CVE-2022-0980: Use after free in New Tab Page
+  * Various fixes from internal audits, fuzzing and other initiatives
+
+-------------------------------------------------------------------
+Fri Mar  4 10:46:36 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>
+
+- Chromium 99.0.4844.51 (boo#1196641)
+  * CVE-2022-0789: Heap buffer overflow in ANGLE
+  * CVE-2022-0790: Use after free in Cast UI
+  * CVE-2022-0791: Use after free in Omnibox
+  * CVE-2022-0792: Out of bounds read in ANGLE
+  * CVE-2022-0793: Use after free in Views
+  * CVE-2022-0794: Use after free in WebShare
+  * CVE-2022-0795: Type Confusion in Blink Layout
+  * CVE-2022-0796: Use after free in Media
+  * CVE-2022-0797: Out of bounds memory access in Mojo
+  * CVE-2022-0798: Use after free in MediaStream
+  * CVE-2022-0799: Insufficient policy enforcement in Installer
+  * CVE-2022-0800: Heap buffer overflow in Cast UI
+  * CVE-2022-0801: Inappropriate implementation in HTML parser
+  * CVE-2022-0802: Inappropriate implementation in Full screen mode
+  * CVE-2022-0803: Inappropriate implementation in Permissions
+  * CVE-2022-0804: Inappropriate implementation in Full screen mode
+  * CVE-2022-0805: Use after free in Browser Switcher
+  * CVE-2022-0806: Data leak in Canvas
+  * CVE-2022-0807: Inappropriate implementation in Autofill
+  * CVE-2022-0808: Use after free in Chrome OS Shell
+  * CVE-2022-0809: Out of bounds memory access in WebXR
+- Removed patches:
+  * chromium-96-EnumTable-crash.patch
+  * chromium-89-missing-cstring-header.patch
+  * chromium-95-libyuv-aarch64.patch
+  * chromium-95-libyuv-arm.patch
+  * chromium-98-MiraclePtr-gcc-ice.patch
+  * chromium-98-WaylandFrameManager-check.patch
+- Added patches:
+  * chromium-97-arm-tflite-cast.patch
+  * chromium-98-gtk4-build.patch
+  * chromium-99-AutofillAssistantModelExecutor-NoDestructor.patch
+  * chromium-98-EnumTable-crash.patch
+  * chromium-third_party-symbolize-missing-include.patch
+  * chromium-v8-missing-utility-include.patch
+
+-------------------------------------------------------------------
+Tue Feb 15 19:13:43 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- Chromium 98.0.4758.102 (boo#1195986)
+  * CVE-2022-0603: Use after free in File Manager
+  * CVE-2022-0604: Heap buffer overflow in Tab Groups
+  * CVE-2022-0605: Use after free in Webstore API
+  * CVE-2022-0606: Use after free in ANGLE
+  * CVE-2022-0607: Use after free in GPU
+  * CVE-2022-0608: Integer overflow in Mojo
+  * CVE-2022-0609: Use after free in Animation
+  * CVE-2022-0610: Inappropriate implementation in Gamepad API
+  * Various fixes from internal audits, fuzzing and other initiatives
+
+-------------------------------------------------------------------
+Thu Feb  3 19:35:46 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- Chromium 98.0.4758.80 (boo#1195420)
+  * CVE-2022-0452: Use after free in Safe Browsing
+  * CVE-2022-0453: Use after free in Reader Mode
+  * CVE-2022-0454: Heap buffer overflow in ANGLE
+  * CVE-2022-0455: Inappropriate implementation in Full Screen Mode
+  * CVE-2022-0456: Use after free in Web Search
+  * CVE-2022-0457: Type Confusion in V8
+  * CVE-2022-0459: Use after free in Screen Capture
+  * CVE-2022-0460: Use after free in Window Dialog
+  * CVE-2022-0461: Policy bypass in COOP
+  * CVE-2022-0462: Inappropriate implementation in Scroll
+  * CVE-2022-0463: Use after free in Accessibility
+  * CVE-2022-0464: Use after free in Accessibility
+  * CVE-2022-0465: Use after free in Extensions
+  * CVE-2022-0466: Inappropriate implementation in Extensions Platform
+  * CVE-2022-0467: Inappropriate implementation in Pointer Lock
+  * CVE-2022-0468: Use after free in Payments
+  * CVE-2022-0469: Use after free in Cast
+  * CVE-2022-0470: Out of bounds memory access in V8
+  * Various fixes from internal audits, fuzzing and other initiatives
+- drop upstreamed patches:
+  * chromium-97-Point-constexpr.patch
+- add patches:
+  * chromium-98-MiraclePtr-gcc-ice.patch
+  * chromium-98-WaylandFrameManager-check.patch
+- change chromium-97-compiler.patch to chromium-98-compiler.patch
+
+-------------------------------------------------------------------
+Fri Jan 21 06:43:25 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
+

chromium-ffmpeg-extra.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package chromium-ffmpeg-extra
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,15 +17,13 @@
 
 
 %define rname chromium
-%define outputdir ${TMPOUT}
+%define outputdir out
 # bsc#1108175
 %define __provides_exclude ^lib.*\\.so.*$
-%if 0%{?suse_version} >= 1550
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400
 %bcond_without system_icu
-%bcond_with system_vpx
 %else
 %bcond_with system_icu
-%bcond_with system_vpx
 %endif
 %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
 %bcond_without pipewire
@@ -33,33 +31,38 @@
 %bcond_with pipewire
 %endif
 %bcond_without system_zlib
-%bcond_with system_freetype
-%ifarch %{arm} aarch64
+%bcond_with system_vpx
+%ifarch aarch64
 %bcond_with swiftshader
 %else
 %bcond_without swiftshader
 %endif
 %if 0%{?suse_version} >= 1550
 %bcond_without system_harfbuzz
+%bcond_without system_freetype
 %else
 %bcond_with system_harfbuzz
+%bcond_with system_freetype
 %endif
-%bcond_without lto
 %bcond_with clang
+# Chromium built with GCC 11 and LTO enabled crashes (boo#1194055)
+%bcond_with lto
 Name:           chromium-ffmpeg-extra
-Version:        96.0.4664.110
+Version:        100.0.4896.127
 Release:        0
 Summary:        Google's open source browser project
 License:        BSD-3-Clause AND LGPL-2.1-or-later
 URL:            https://www.chromium.org/
 Source0:        https://commondatastorage.googleapis.com/chromium-browser-official/%{rname}-%{version}.tar.xz
-Source1:        README.SUSE
+Source1:        esbuild.tar.gz
+Source3:        README.SUSE
 # Toolchain definitions
 Source30:       master_preferences
 Source104:      chromium-symbolic.svg
 # https://source.chromium.org/chromium/chromium/src/+/refs/tags/%%{version}:chrome/installer/linux/common/installer.include
 Source105:      INSTALL.sh
 #
+Source106:      chrome-wrapper
 Patch0:         chromium-libusb_interrupt_event_handler.patch
 # PATCH-FIX-OPENSUSE Make the 1-click-install ymp file always download bnc#836059
 Patch1:         exclude_ymp.patch
@@ -80,34 +83,29 @@
 # gentoo/fedora/arch patchset
 Patch12:        chromium-78-protobuf-RepeatedPtrField-export.patch
 Patch13:        chromium-80-QuicStreamSendBuffer-deleted-move-constructor.patch
-Patch15:        chromium-96-compiler.patch
+Patch15:        chromium-100-compiler.patch
 Patch17:        chromium-86-ImageMemoryBarrierData-init.patch
-Patch18:        chromium-86-nearby-explicit.patch
-Patch19:        chromium-86-nearby-include.patch
-Patch20:        chromium-86-f_seal.patch
 Patch21:        chromium-gcc11.patch
-Patch25:        chromium-90-fseal.patch
-Patch31:        chromium-89-missing-cstring-header.patch
 Patch40:        chromium-91-java-only-allowed-in-android-builds.patch
-Patch44:        chromium-95-libyuv-aarch64.patch
 Patch46:        chromium-91-sql-standard-layout-type.patch
 Patch50:        chromium-clang-nomerge.patch
-Patch51:        chromium-glibc-2.34.patch
 Patch62:        chromium-93-ffmpeg-4.4.patch
 Patch63:        chromium-ffmpeg-lp152.patch
 Patch65:        chromium-94-sql-no-assert.patch
 Patch69:        chromium-93-InkDropHost-crash.patch
 Patch72:        chromium-95-quiche-include.patch
-Patch73:        chromium-96-CommandLine-include.patch
-Patch74:        chromium-96-RestrictedCookieManager-tuple.patch
-Patch75:        chromium-96-DrmRenderNodePathFinder-include.patch
-Patch76:        chromium-96-CouponDB-include.patch
-# Google seem not too keen on merging this but GPU accel is quite important
-#  https://chromium-review.googlesource.com/c/chromium/src/+/532294
-#  https://github.com/saiarcot895/chromium-ubuntu-build/tree/master/debian/patches
-#  Recreated from scratch to be smaller and use system the orginal switches
-#  (default on) compared to the PR
-Patch100:       chromium-vaapi.patch
+Patch78:        chromium-98-EnumTable-crash.patch
+Patch80:        chromium-97-ScrollView-reference.patch
+Patch84:        chromium-third_party-symbolize-missing-include.patch
+Patch85:        chromium-fix-swiftshader-template.patch
+Patch86:        chromium-97-arm-tflite-cast.patch
+Patch87:        chromium-98-gtk4-build.patch
+Patch89:        chromium-100-GLImplementationParts-constexpr.patch
+Patch90:        chromium-100-InMilliseconds-constexpr.patch
+Patch91:        chromium-100-SCTHashdanceMetadata-move.patch
+Patch92:        chromium-100-macro-typo.patch
+Patch93:        chromium-missing-include-tuple.patch
+Patch94:        chromium-webrtc-stats-missing-vector.patch
 Patch101:       chromium-86-fix-vaapi-on-intel.patch
 # PATCH-FIX-SUSE: allow prop codecs to be set with chromium branding
 Patch102:       chromium-prop-codecs.patch
@@ -121,6 +119,7 @@
 BuildRequires:  gn >= 0.1807
 BuildRequires:  gperf
 BuildRequires:  hicolor-icon-theme
+BuildRequires:  golang(API)
 # Java used during build
 BuildRequires:  java-openjdk-headless
 BuildRequires:  libcap-devel
@@ -210,7 +209,7 @@
 BuildRequires:  pkgconfig(xext)
 BuildRequires:  pkgconfig(xfixes)
 BuildRequires:  pkgconfig(xi)
-BuildRequires:  pkgconfig(xkbcommon)
+BuildRequires:  pkgconfig(xkbcommon) >= 1.0.0
 BuildRequires:  pkgconfig(xrandr)
 BuildRequires:  pkgconfig(xrender)
 BuildRequires:  pkgconfig(xscrnsaver)
@@ -252,20 +251,23 @@
 BuildRequires:  lld12
 BuildRequires:  llvm12
 %else
+#!BuildIgnore:  gcc
 BuildRequires:  clang
+BuildRequires:  gcc10
+BuildRequires:  libstdc++6-devel-gcc10
 BuildRequires:  lld
 BuildRequires:  llvm
 %endif
 %endif
 %if %{without clang}
 BuildRequires:  binutils-gold
-#%if %{?suse_version} >= 1550
-#BuildRequires:  gcc
-#BuildRequires:  gcc-c++
-#%else
+%if %{?suse_version} >= 1550
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
+%else
 BuildRequires:  gcc10
 BuildRequires:  gcc10-c++
-#%endif
+%endif
 %endif
 
 %description
@@ -277,8 +279,18 @@
 %autopatch -p1
 
 %build
-mktemp -d -t chromium-XXXXXXXXXX > temp.txt
-export TMPOUT=`cat temp.txt`
+# esbuild
+rm third_party/devtools-frontend/src/third_party/esbuild/esbuild
+tar -xf %{SOURCE1}
+pushd esbuild
+gflags="-mod=vendor"
+%if 0%{?suse_version} >= 1550
+gflags+=" -buildvcs=false"
+%endif
+GO_FLAGS="${gflags}" make
+cp -a esbuild ../third_party/devtools-frontend/src/third_party/esbuild/esbuild
+popd
+
 # Fix the path to nodejs binary
 mkdir -p third_party/node/linux/node-linux-x64/bin
 ln -s %{_bindir}/node third_party/node/linux/node-linux-x64/bin/node
@@ -292,6 +304,10 @@
 ln -sfn %{_bindir}/$PYTHON $HOME/bin/python
 export PATH="$HOME/bin/:$PATH"
 
+# use our wrapper (disabled)
+#rm chrome/installer/linux/common/wrapper
+#cp %{SOURCE106} chrome/installer/linux/common/wrapper
+
 # Remove bundled libs
 keeplibs=(
     base/third_party/cityhash
@@ -361,6 +377,7 @@
     third_party/depot_tools/third_party/six
     third_party/devscripts

chromium-100-GLImplementationParts-constexpr.patch Added

@@ -0,0 +1,92 @@
+From d32156fd3773330eca99e9cba5e18db57aaa1a53 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Sat, 19 Feb 2022 10:14:24 +0000
+Subject: PATCH GCC: make GLImplementationParts constructors constexpr
+
+Fix build error in GCC, as the constexpr operator== requires its
+invocations to be also constexpr.
+---
+ ui/gl/gl_implementation.cc | 23 -----------------------
+ ui/gl/gl_implementation.h  | 25 +++++++++++++++++++++++--
+ 2 files changed, 23 insertions(+), 25 deletions(-)
+
+diff --git a/ui/gl/gl_implementation.cc b/ui/gl/gl_implementation.cc
+index e4e5456..3e4a47c 100644
+--- a/ui/gl/gl_implementation.cc
++++ b/ui/gl/gl_implementation.cc
+@@ -26,29 +26,6 @@
+ 
+ namespace gl {
+ 
+-ANGLEImplementation MakeANGLEImplementation(
+-    const GLImplementation gl_impl,
+-    const ANGLEImplementation angle_impl) {
+-  if (gl_impl == kGLImplementationEGLANGLE) {
+-    if (angle_impl == ANGLEImplementation::kNone) {
+-      return ANGLEImplementation::kDefault;
+-    } else {
+-      return angle_impl;
+-    }
+-  } else {
+-    return ANGLEImplementation::kNone;
+-  }
+-}
+-
+-GLImplementationParts::GLImplementationParts(
+-    const ANGLEImplementation angle_impl)
+-    : gl(kGLImplementationEGLANGLE),
+-      angle(MakeANGLEImplementation(kGLImplementationEGLANGLE, angle_impl)) {}
+-
+-GLImplementationParts::GLImplementationParts(const GLImplementation gl_impl)
+-    : gl(gl_impl),
+-      angle(MakeANGLEImplementation(gl_impl, ANGLEImplementation::kDefault)) {}
+-
+ bool GLImplementationParts::IsValid() const {
+   if (angle == ANGLEImplementation::kNone) {
+     return (gl != kGLImplementationEGLANGLE);
+diff --git a/ui/gl/gl_implementation.h b/ui/gl/gl_implementation.h
+index 376ed58..a2513ea 100644
+--- a/ui/gl/gl_implementation.h
++++ b/ui/gl/gl_implementation.h
+@@ -59,8 +59,14 @@ enum class ANGLEImplementation {
+ };
+ 
+ struct GL_EXPORT GLImplementationParts {
+-  explicit GLImplementationParts(const ANGLEImplementation angle_impl);
+-  explicit GLImplementationParts(const GLImplementation gl_impl);
++  constexpr explicit GLImplementationParts(const ANGLEImplementation angle_impl)
++      : gl(kGLImplementationEGLANGLE),
++        angle(MakeANGLEImplementation(kGLImplementationEGLANGLE, angle_impl)) {}
++
++  constexpr explicit GLImplementationParts(const GLImplementation gl_impl)
++      : gl(gl_impl),
++        angle(MakeANGLEImplementation(gl_impl, ANGLEImplementation::kDefault)) {
++  }
+ 
+   GLImplementation gl = kGLImplementationNone;
+   ANGLEImplementation angle = ANGLEImplementation::kNone;
+@@ -80,6 +86,21 @@ struct GL_EXPORT GLImplementationParts {
+   bool IsValid() const;
+   bool IsAllowed(const std::vector<GLImplementationParts>& allowed_impls) const;
+   std::string ToString() const;
++
++ private:
++  constexpr ANGLEImplementation MakeANGLEImplementation(
++      const GLImplementation gl_impl,
++      const ANGLEImplementation angle_impl) {
++    if (gl_impl == kGLImplementationEGLANGLE) {
++      if (angle_impl == ANGLEImplementation::kNone) {
++        return ANGLEImplementation::kDefault;
++      } else {
++        return angle_impl;
++      }
++    } else {
++      return ANGLEImplementation::kNone;
++    }
++  }
+ };
+ 
+ struct GL_EXPORT GLWindowSystemBindingInfo {
+-- 
+2.34.1
+

chromium-100-InMilliseconds-constexpr.patch Added

@@ -0,0 +1,97 @@
+From da6e3f6071fdabeb96c0805626418414b4a4cea8 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Wed, 9 Feb 2022 17:56:21 +0000
+Subject: PATCH GCC: make base::InMilliseconds(F,RoundedUp) constexpr
+
+media::DecodeTimestamp uses it in several constexpr methods.
+---
+ base/time/time.cc | 24 ------------------------
+ base/time/time.h  | 30 +++++++++++++++++++++++++++---
+ 2 files changed, 27 insertions(+), 27 deletions(-)
+
+diff --git a/base/time/time.cc b/base/time/time.cc
+index 0de273e..e0acda2 100644
+--- a/base/time/time.cc
++++ b/base/time/time.cc
+@@ -74,30 +74,6 @@ int TimeDelta::InDaysFloored() const {
+                       : std::numeric_limits<int>::max();
+ }
+ 
+-double TimeDelta::InMillisecondsF() const {
+-  if (!is_inf())
+-    return static_cast<double>(delta_) / Time::kMicrosecondsPerMillisecond;
+-  return (delta_ < 0) ? -std::numeric_limits<double>::infinity()
+-                      : std::numeric_limits<double>::infinity();
+-}
+-
+-int64_t TimeDelta::InMilliseconds() const {
+-  if (!is_inf())
+-    return delta_ / Time::kMicrosecondsPerMillisecond;
+-  return (delta_ < 0) ? std::numeric_limits<int64_t>::min()
+-                      : std::numeric_limits<int64_t>::max();
+-}
+-
+-int64_t TimeDelta::InMillisecondsRoundedUp() const {
+-  if (!is_inf()) {
+-    const int64_t result = delta_ / Time::kMicrosecondsPerMillisecond;
+-    // Convert |result| from truncating to ceiling.
+-    return (delta_ > result * Time::kMicrosecondsPerMillisecond) ? (result + 1)
+-                                                                 : result;
+-  }
+-  return delta_;
+-}
+-
+ double TimeDelta::InMicrosecondsF() const {
+   if (!is_inf())
+     return static_cast<double>(delta_);
+diff --git a/base/time/time.h b/base/time/time.h
+index c027aab..fb1d78d 100644
+--- a/base/time/time.h
++++ b/base/time/time.h
+@@ -216,9 +216,9 @@ class BASE_EXPORT TimeDelta {
+   constexpr int InMinutes() const;
+   constexpr double InSecondsF() const;
+   constexpr int64_t InSeconds() const;
+-  double InMillisecondsF() const;
+-  int64_t InMilliseconds() const;
+-  int64_t InMillisecondsRoundedUp() const;
++  constexpr double InMillisecondsF() const;
++  constexpr int64_t InMilliseconds() const;
++  constexpr int64_t InMillisecondsRoundedUp() const;
+   constexpr int64_t InMicroseconds() const { return delta_; }
+   double InMicrosecondsF() const;
+   constexpr int64_t InNanoseconds() const;
+@@ -889,6 +889,30 @@ constexpr int64_t TimeDelta::InSeconds() const {
+   return is_inf() ? delta_ : (delta_ / Time::kMicrosecondsPerSecond);
+ }
+ 
++constexpr double TimeDelta::InMillisecondsF() const {
++  if (!is_inf())
++    return static_cast<double>(delta_) / Time::kMicrosecondsPerMillisecond;
++  return (delta_ < 0) ? -std::numeric_limits<double>::infinity()
++                      : std::numeric_limits<double>::infinity();
++}
++
++constexpr int64_t TimeDelta::InMilliseconds() const {
++  if (!is_inf())
++    return delta_ / Time::kMicrosecondsPerMillisecond;
++  return (delta_ < 0) ? std::numeric_limits<int64_t>::min()
++                      : std::numeric_limits<int64_t>::max();
++}
++
++constexpr int64_t TimeDelta::InMillisecondsRoundedUp() const {
++  if (!is_inf()) {
++    const int64_t result = delta_ / Time::kMicrosecondsPerMillisecond;
++    // Convert |result| from truncating to ceiling.
++    return (delta_ > result * Time::kMicrosecondsPerMillisecond) ? (result + 1)
++                                                                 : result;
++  }
++  return delta_;
++}
++
+ constexpr int64_t TimeDelta::InNanoseconds() const {
+   return base::ClampMul(delta_, Time::kNanosecondsPerMicrosecond);
+ }
+-- 
+2.34.1
+

chromium-100-SCTHashdanceMetadata-move.patch Added

@@ -0,0 +1,35 @@
+From 364dc0067d1c20c7a2d21277a7ec0c4419d9bc11 Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jdapena@igalia.com>
+Date: Wed, 23 Feb 2022 12:18:57 +0100
+Subject: PATCH GCC: explicitely move return value of SCTHashdanceMetadata::ToValue
+
+GCC rejects to do Return Value Optimization in
+SCTHashdanceMetadata::ToValue, because the copy constructor is
+deleted, and in that scenario RVO is rejected in GCC:
+    ../../services/network/sct_auditing/sct_auditing_reporter.cc: In member function ‘base::Value network::SCTAuditingReporter::SCTHashdanceMetadata::ToValue() const’:
+    ../../services/network/sct_auditing/sct_auditing_reporter.cc:191:10: error: use of deleted function ‘base::Value::Value(const base::Value&)’
+      191 |   return value;
+          |          ^~~~~
+    In file included from ../../services/network/sct_auditing/sct_auditing_reporter.h:14,
+                     from ../../services/network/sct_auditing/sct_auditing_reporter.cc:5:
+    ../../base/values.h:254:3: note: declared here
+      254 |   Value(const Value&) = delete;
+          |   ^~~~~
+
+Bug: 819294
+Change-Id: I111e51dd10eee7b909d4ac3c0911aac18a589166
+---
+
+diff --git a/services/network/sct_auditing/sct_auditing_reporter.cc b/services/network/sct_auditing/sct_auditing_reporter.cc
+index a057e8e..365527b 100644
+--- a/services/network/sct_auditing/sct_auditing_reporter.cc
++++ b/services/network/sct_auditing/sct_auditing_reporter.cc
+@@ -188,7 +188,7 @@
+       kLogIdKey, base::Base64Encode(base::as_bytes(base::make_span(log_id))));
+   value.SetKey(kLogMMDKey, base::TimeDeltaToValue(log_mmd));
+   value.SetKey(kCertificateExpiry, base::TimeToValue(certificate_expiry));
+-  return value;
++  return std::move(value);
+ }
+ 
+ // static

chromium-100-compiler.patch Added

@@ -0,0 +1,220 @@
+From 307a0f63dd9b118f4b8470ed3d7567e81fdb7a6d Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 3 Feb 2022 16:26:20 +0000
+Subject: PATCH Disable various compiler configs
+
+---
+ build/config/compiler/BUILD.gn | 105 ++++++---------------------------
+ 1 file changed, 17 insertions(+), 88 deletions(-)
+
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index 61ceb0d..7392018 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -291,9 +291,7 @@ config("compiler") {
+ 
+   configs += 
+     # See the definitions below.
+-    ":clang_revision",
+     ":rustc_revision",
+-    ":compiler_cpu_abi",
+     ":compiler_codegen",
+     ":compiler_deterministic",
+   
+@@ -534,31 +532,6 @@ config("compiler") {
+     ldflags +=  "-Wl,-z,keep-text-section-prefix" 
+   }
+ 
+-  if (is_clang && !is_nacl && current_os != "zos") {
+-    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" 
+-      }
+-    }
+-
+-    # TODO(crbug.com/1235145): Investigate why/if this should be needed.
+-    if (is_win) {
+-      cflags +=  "/clang:-ffp-contract=off" 
+-    } else {
+-      cflags +=  "-ffp-contract=off" 
+-    }
+-  }
+-
+   # Rust compiler setup (for either clang or rustc).
+   if (enable_rust) {
+     defines +=  "RUST_ENABLED" 
+@@ -1235,45 +1208,6 @@ config("compiler_deterministic") {
+     }
+   }
+ 
+-  # Makes builds independent of absolute file path.
+-  if (is_clang && strip_absolute_paths_from_debug_symbols) {
+-    # If debug option is given, clang includes $cwd in debug info by default.
+-    # For such build, this flag generates reproducible obj files even we use
+-    # different build directory like "out/feature_a" and "out/feature_b" if
+-    # we build same files with same compile flag.
+-    # Other paths are already given in relative, no need to normalize them.
+-    if (is_nacl) {
+-      # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
+-      cflags += 
+-        "-Xclang",
+-        "-fdebug-compilation-dir",
+-        "-Xclang",
+-        ".",
+-      
+-    } else {
+-      # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
+-      # and -fcoverage-compilation-dir=.
+-      cflags +=  "-ffile-compilation-dir=." 
+-    }
+-    if (!is_win) {
+-      # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
+-      asmflags =  "-Wa,-fdebug-compilation-dir,." 
+-    }
+-
+-    if (is_win && use_lld) {
+-      if (symbol_level == 2 || (is_clang && using_sanitizer)) {
+-        # Absolutize source file paths for PDB. Pass the real build directory
+-        # if the pdb contains source-level debug information and if linker
+-        # reproducibility is not critical.
+-        ldflags +=  "/PDBSourcePath:" + rebase_path(root_build_dir) 
+-      } else {
+-        # Use a fake fixed base directory for paths in the pdb to make the pdb
+-        # output fully deterministic and independent of the build directory.
+-        ldflags +=  "/PDBSourcePath:o:\fake\prefix" 
+-      }
+-    }
+-  }
+-
+   # Tells the compiler not to use absolute paths when passing the default
+   # paths to the tools it invokes. We don't want this because we don't
+   # really need it and it can mess up the goma cache entries.
+@@ -1594,7 +1528,7 @@ config("chromium_code") {
+       defines =  "_HAS_NODISCARD" 
+     }
+   } else {
+-    cflags =  "-Wall" 
++    cflags = 
+     if (treat_warnings_as_errors) {
+       cflags +=  "-Werror" 
+ 
+@@ -1603,10 +1537,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.
+@@ -1615,15 +1545,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" 
+@@ -2026,7 +1947,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.
+@@ -2064,7 +1986,8 @@ config("optimize") {
+ }
+ 
+ # Turn off optimizations.
+-config("no_optimize") {
++config("no_optimize") { }
++config("xno_optimize") {
+   if (is_win) {
+     cflags = 
+       "/Od",  # Disable optimization.
+@@ -2104,7 +2027,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:
+@@ -2137,7 +2061,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:
+@@ -2163,7 +2088,8 @@ config("optimize_speed") {
+   }
+ }
+ 
+-config("optimize_fuzzing") {
++config("optimize_fuzzing") { }
++config("xoptimize_fuzzing") {
+   cflags =  "-O1"  + common_optimize_on_cflags
+   rustflags =  "-Copt-level=1" 
+   ldflags = common_optimize_on_ldflags
+@@ -2283,7 +2209,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.
+@@ -2411,7 +2338,8 @@ config("symbols") {
+ # Minimal symbols.

chromium-100-macro-typo.patch Added

chromium-86-f_seal.patch Deleted

chromium-86-nearby-explicit.patch Deleted

@@ -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
-

chromium-86-nearby-include.patch Deleted

chromium-89-missing-cstring-header.patch Deleted

@@ -1,37 +0,0 @@
-Index: chromium-96.0.4664.45/third_party/webrtc/audio/utility/channel_mixer.cc
-===================================================================
---- chromium-96.0.4664.45.orig/third_party/webrtc/audio/utility/channel_mixer.cc
-+++ chromium-96.0.4664.45/third_party/webrtc/audio/utility/channel_mixer.cc
-@@ -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"
-Index: chromium-96.0.4664.45/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
-===================================================================
---- chromium-96.0.4664.45.orig/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
-+++ chromium-96.0.4664.45/third_party/webrtc/modules/desktop_capture/linux/base_capturer_pipewire.cc
-@@ -19,6 +19,7 @@
- #include <sys/syscall.h>
- #include <unistd.h>
- 
-+#include <cstring>
- #include <memory>
- #include <string>
- #include <utility>
-Index: chromium-96.0.4664.45/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc
-===================================================================
---- chromium-96.0.4664.45.orig/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc
-+++ chromium-96.0.4664.45/third_party/webrtc/modules/video_coding/utility/ivf_file_reader.cc
-@@ -10,6 +10,7 @@
- 
- #include "modules/video_coding/utility/ivf_file_reader.h"
- 
-+#include <cstring>
- #include <string>
- #include <vector>
-

chromium-90-fseal.patch Deleted

@@ -1,48 +0,0 @@
---- chromium-90.0.4430.85/mojo/core/channel_linux.cc.xx	2021-04-26 10:31:10.188705842 +0200
-+++ chromium-90.0.4430.85/mojo/core/channel_linux.cc	2021-04-26 11:23:26.997161282 +0200
-@@ -5,6 +5,21 @@
- #include "mojo/core/channel_linux.h"
- 
- #include <fcntl.h>
-+#ifndef F_SEAL_SEAL
-+# define F_SEAL_SEAL    0x0001
-+#endif
-+#ifndef F_SEAL_SHRINK
-+# define F_SEAL_SHRINK        0x0002
-+#endif
-+#ifndef F_SEAL_GROW
-+# define F_SEAL_GROW  0x0004
-+#endif
-+#ifndef F_ADD_SEALS
-+# define F_ADD_SEALS    1033
-+#endif
-+#ifndef F_GET_SEALS
-+# define F_GET_SEALS    1034
-+#endif
- #include <linux/futex.h>
- #include <linux/memfd.h>
- #include <sys/eventfd.h>
---- chromium-90.0.4430.85/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc.xx	2021-04-26 16:39:18.387482941 +0200
-+++ chromium-90.0.4430.85/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc	2021-04-26 16:40:10.866754337 +0200
-@@ -6,6 +6,21 @@
- 
- #include <errno.h>
- #include <fcntl.h>
-+#ifndef F_SEAL_SEAL
-+# define F_SEAL_SEAL    0x0001
-+#endif
-+#ifndef F_SEAL_SHRINK
-+# define F_SEAL_SHRINK        0x0002
-+#endif
-+#ifndef F_SEAL_GROW
-+# define F_SEAL_GROW  0x0004
-+#endif
-+#ifndef F_ADD_SEALS
-+# define F_ADD_SEALS    1033
-+#endif
-+#ifndef F_GET_SEALS
-+# define F_GET_SEALS    1034
-+#endif
- #include <linux/net.h>
- #include <sched.h>
- #include <signal.h>

chromium-91-sql-standard-layout-type.patch Changed

@@ -20,11 +20,11 @@
  sql/recover_module/pager.h   |  5 +++--
  6 files changed, 47 insertions(+), 29 deletions(-)
 
-diff --git a/sql/recover_module/btree.cc b/sql/recover_module/btree.cc
-index 9ecaafe8a3..839318abf9 100644
---- a/sql/recover_module/btree.cc
-+++ b/sql/recover_module/btree.cc
-@@ -135,16 +135,25 @@ static_assert(std::is_trivially_destructible<LeafPageDecoder>::value,
+Index: chromium-98.0.4758.80/sql/recover_module/btree.cc
+===================================================================
+--- chromium-98.0.4758.80.orig/sql/recover_module/btree.cc
++++ chromium-98.0.4758.80/sql/recover_module/btree.cc
+@@ -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()
  
@@ -56,11 +56,11 @@
  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 d76d076bf6..33114b01fa 100644
---- a/sql/recover_module/btree.h
-+++ b/sql/recover_module/btree.h
-@@ -102,7 +102,7 @@ class LeafPageDecoder {
+Index: chromium-98.0.4758.80/sql/recover_module/btree.h
+===================================================================
+--- chromium-98.0.4758.80.orig/sql/recover_module/btree.h
++++ chromium-98.0.4758.80/sql/recover_module/btree.h
+@@ -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.
@@ -69,7 +69,7 @@
    ~LeafPageDecoder() noexcept = default;
  
    LeafPageDecoder(const LeafPageDecoder&) = delete;
-@@ -150,6 +150,15 @@ class LeafPageDecoder {
+@@ -151,6 +151,15 @@ class LeafPageDecoder {
    // read as long as CanAdvance() returns true.
    bool TryAdvance();
  
@@ -85,7 +85,7 @@
    // 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 @@ class LeafPageDecoder {
+@@ -164,14 +173,14 @@ class LeafPageDecoder {
    static int ComputeCellCount(DatabasePageReader* db_reader);
  
    // The number of the B-tree page this reader is reading.
@@ -103,11 +103,11 @@
  
    // The reader's cursor state.
    //
-diff --git a/sql/recover_module/cursor.cc b/sql/recover_module/cursor.cc
-index 0029ff9295..42548bc4b5 100644
---- a/sql/recover_module/cursor.cc
-+++ b/sql/recover_module/cursor.cc
-@@ -26,7 +26,7 @@ VirtualCursor::~VirtualCursor() {
+Index: chromium-98.0.4758.80/sql/recover_module/cursor.cc
+===================================================================
+--- chromium-98.0.4758.80.orig/sql/recover_module/cursor.cc
++++ chromium-98.0.4758.80/sql/recover_module/cursor.cc
+@@ -28,7 +28,7 @@ VirtualCursor::~VirtualCursor() {
  int VirtualCursor::First() {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
    inner_decoders_.clear();
@@ -116,7 +116,7 @@
  
    AppendPageDecoder(table_->root_page_id());
    return Next();
-@@ -36,18 +36,18 @@ int VirtualCursor::Next() {
+@@ -38,18 +38,18 @@ int VirtualCursor::Next() {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
    record_reader_.Reset();
  
@@ -142,7 +142,7 @@
          continue;
        }
        if (!record_reader_.Initialize())
-@@ -99,13 +99,13 @@ int VirtualCursor::ReadColumn(int column_index,
+@@ -101,13 +101,13 @@ int VirtualCursor::ReadColumn(int column
  int64_t VirtualCursor::RowId() {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
    DCHECK(record_reader_.IsInitialized());
@@ -159,7 +159,7 @@
        << __func__
        << " must only be called when the current path has no leaf decoder";
  
-@@ -113,7 +113,7 @@ void VirtualCursor::AppendPageDecoder(int page_id) {
+@@ -115,7 +115,7 @@ void VirtualCursor::AppendPageDecoder(in
      return;
  
    if (LeafPageDecoder::IsOnValidPage(&db_reader_)) {
@@ -168,11 +168,11 @@
      return;
    }
  
-diff --git a/sql/recover_module/cursor.h b/sql/recover_module/cursor.h
-index afcd6900e1..b15c31d425 100644
---- a/sql/recover_module/cursor.h
-+++ b/sql/recover_module/cursor.h
-@@ -129,7 +129,7 @@ class VirtualCursor {
+Index: chromium-98.0.4758.80/sql/recover_module/cursor.h
+===================================================================
+--- chromium-98.0.4758.80.orig/sql/recover_module/cursor.h
++++ chromium-98.0.4758.80/sql/recover_module/cursor.h
+@@ -130,7 +130,7 @@ class VirtualCursor {
    std::vector<std::unique_ptr<InnerPageDecoder>> inner_decoders_;
  
    // Decodes the leaf page containing records.
@@ -181,11 +181,11 @@
  
    SEQUENCE_CHECKER(sequence_checker_);
  };
-diff --git a/sql/recover_module/pager.cc b/sql/recover_module/pager.cc
-index 58e75de270..5fe96204e5 100644
---- a/sql/recover_module/pager.cc
-+++ b/sql/recover_module/pager.cc
-@@ -23,8 +23,7 @@ static_assert(DatabasePageReader::kMaxPageId <= std::numeric_limits<int>::max(),
+Index: chromium-98.0.4758.80/sql/recover_module/pager.cc
+===================================================================
+--- chromium-98.0.4758.80.orig/sql/recover_module/pager.cc
++++ chromium-98.0.4758.80/sql/recover_module/pager.cc
+@@ -23,8 +23,7 @@ static_assert(DatabasePageReader::kMaxPa
                "ints are not appropriate for representing page IDs");
  
  DatabasePageReader::DatabasePageReader(VirtualTable* table)
@@ -195,7 +195,7 @@
    DCHECK(table != nullptr);
    DCHECK(IsValidPageSize(table->page_size()));
  }
-@@ -57,8 +56,8 @@ int DatabasePageReader::ReadPage(int page_id) {
+@@ -57,8 +56,8 @@ int DatabasePageReader::ReadPage(int pag
                      std::numeric_limits<int64_t>::max(),
                  "The |read_offset| computation above may overflow");
  
@@ -206,10 +206,10 @@
  
    // |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 0e388ddc3b..99314e30ff 100644
---- a/sql/recover_module/pager.h
-+++ b/sql/recover_module/pager.h
+Index: chromium-98.0.4758.80/sql/recover_module/pager.h
+===================================================================
+--- chromium-98.0.4758.80.orig/sql/recover_module/pager.h
++++ chromium-98.0.4758.80/sql/recover_module/pager.h
 @@ -5,6 +5,7 @@
  #ifndef SQL_RECOVER_MODULE_PAGER_H_
  #define SQL_RECOVER_MODULE_PAGER_H_
@@ -218,7 +218,7 @@
  #include <cstdint>
  #include <memory>
  #include <ostream>
-@@ -70,7 +71,7 @@ class DatabasePageReader {
+@@ -72,7 +73,7 @@ class DatabasePageReader {
      DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
      DCHECK_NE(page_id_, kInvalidPageId)
          << "Successful ReadPage() required before accessing pager state";
@@ -227,7 +227,7 @@
    }
  
    // The number of bytes in the page read by the last ReadPage() call.
-@@ -137,7 +138,7 @@ class DatabasePageReader {
+@@ -139,7 +140,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.
@@ -235,4 +235,4 @@
 +  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_;
+   const raw_ptr<VirtualTable> table_;

chromium-94-ffmpeg-roll.patch Changed

@@ -1,49 +1,12 @@
-From b94755e4633045be96ab5e0bdde0db7e16a804bd Mon Sep 17 00:00:00 2001
-From: "liberato@chromium.org" <liberato@chromium.org>
-Date: Fri, 6 Aug 2021 04:25:31 +0000
-Subject: PATCH FFmpeg M94 roll.
-
-Contains DEPS update + chromium-side fixes.
-
-Bug: 1227259
-Change-Id: I61c5eaa789ea12c17d0cbcbf837435b9cf32479b
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3011889
-Reviewed-by: Thomas Guilbert <tguilbert@chromium.org>
-Commit-Queue: Frank Liberato <liberato@chromium.org>
-Cr-Commit-Position: refs/heads/master@{#909174}
----
- media/ffmpeg/ffmpeg_common.h    | 1 +
- media/filters/ffmpeg_demuxer.cc | 4 ++--
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h
-index cede8ac5a7..97d6307e28 100644
---- a/media/ffmpeg/ffmpeg_common.h
-+++ b/media/ffmpeg/ffmpeg_common.h
-@@ -29,7 +29,6 @@ extern "C" {
- #include <libavformat/avformat.h>
- #include <libavformat/avio.h>
- #include <libavutil/avutil.h>
--#include <libavutil/channel_layout.h>
- #include <libavutil/imgutils.h>
- #include <libavutil/log.h>
- #include <libavutil/mastering_display_metadata.h>
-diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
-index ac4713b072..605001d935 100644
---- a/media/filters/ffmpeg_demuxer.cc
-+++ b/media/filters/ffmpeg_demuxer.cc
-@@ -106,12 +106,12 @@ static base::TimeDelta ExtractStartTime(AVStream* stream) {
+diff --git a/build/linux/unbundle/ffmpeg.gn b/build/linux/unbundle/ffmpeg.gn
+index 16e20744706..6a079b32221 100644
+--- a/build/linux/unbundle/ffmpeg.gn
++++ b/build/linux/unbundle/ffmpeg.gn
+@@ -12,6 +12,7 @@ pkg_config("system_ffmpeg") {
+     "libavformat",
+     "libavutil",
+   
++  defines =  "av_stream_get_first_dts(stream)=stream->first_dts" 
+ }
  
-   // Next try to use the first DTS value, for codecs where we know PTS == DTS
-   // (excludes all H26x codecs). The start time must be returned in PTS.
-+  if (stream->first_dts != kNoFFmpegTimestamp &&
--  if (av_stream_get_first_dts(stream) != kNoFFmpegTimestamp &&
-       stream->codecpar->codec_id != AV_CODEC_ID_HEVC &&
-       stream->codecpar->codec_id != AV_CODEC_ID_H264 &&
-       stream->codecpar->codec_id != AV_CODEC_ID_MPEG4) {
-     const base::TimeDelta first_pts =
-+        ConvertFromTimeBase(stream->time_base, stream->first_dts);
--        ConvertFromTimeBase(stream->time_base, av_stream_get_first_dts(stream));
-     if (first_pts < start_time)
-       start_time = first_pts;
-   }
+ buildflag_header("ffmpeg_features") {

chromium-95-libyuv-aarch64.patch Deleted

@@ -1,30 +0,0 @@
-diff --git a/third_party/libyuv/source/row_neon64.cc b/third_party/libyuv/source/row_neon64.cc
-index 350c964..2aab413 100644
---- a/third_party/libyuv/source/row_neon64.cc
-+++ b/third_party/libyuv/source/row_neon64.cc
-@@ -1835,7 +1835,7 @@ void ARGBToAB64Row_NEON(const uint8_t* src_argb,
-       : "+r"(src_argb),          // %0
-         "+r"(dst_ab64),          // %1
-         "+r"(width)              // %2
--      : "m"(kShuffleARGBToABGR)  // %3
-+      : "Q"(kShuffleARGBToABGR)  // %3
-       : "cc", "memory", "v0", "v1", "v2", "v3", "v4");
- }
- 
-@@ -1859,7 +1859,7 @@ void AR64ToARGBRow_NEON(const uint16_t* src_ar64,
-       : "+r"(src_ar64),          // %0
-         "+r"(dst_argb),          // %1
-         "+r"(width)              // %2
--      : "m"(kShuffleAR64ToARGB)  // %3
-+      : "Q"(kShuffleAR64ToARGB)  // %3
-       : "cc", "memory", "v0", "v1", "v2", "v3", "v4");
- }
- 
-@@ -1883,7 +1883,7 @@ void AB64ToARGBRow_NEON(const uint16_t* src_ab64,
-       : "+r"(src_ab64),          // %0
-         "+r"(dst_argb),          // %1
-         "+r"(width)              // %2
--      : "m"(kShuffleAB64ToARGB)  // %3
-+      : "Q"(kShuffleAB64ToARGB)  // %3
-       : "cc", "memory", "v0", "v1", "v2", "v3", "v4");
- }

chromium-96-CommandLine-include.patch Deleted

chromium-96-CouponDB-include.patch Deleted

chromium-96-DrmRenderNodePathFinder-include.patch Deleted

chromium-96-RestrictedCookieManager-tuple.patch Deleted

@@ -1,31 +0,0 @@
-From 86b1886673c3e75d3a7b8c802b3e9fa6ea945a1e Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jdapena@igalia.com>
-Date: Fri, 08 Oct 2021 06:32:55 +0000
-Subject: PATCH libstdc++: no implicit conversion from tuple created with std::tie to an std::pair in restricted cookie manager.
-
-Fix compilation error:
-    ../../services/network/restricted_cookie_manager.cc:164:30: error: no match for ‘operator’ (operand types are ‘network::CookieAccessesByURLAndSite’ {aka ‘std::map<std::pair<GURL, net::SiteForCookies>, std::unique_ptr<std::set<net::CookieWithAccessResult, network::CookieWithAccessResultComparer> > >’} and ‘std::tuple<const GURL&, const net::SiteForCookies&>’)
-
-There is no conversion from tuple to pair.
-
-Bug: 957519
-Change-Id: Idf29c7b21895ae28f45b35d6193ab4ac555945c8
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3211752
-Reviewed-by: Robbie McElrath <rmcelrath@chromium.org>
-Commit-Queue: José Dapena Paz <jdapena@igalia.com>
-Cr-Commit-Position: refs/heads/main@{#929597}
----
-
-diff --git a/services/network/restricted_cookie_manager.cc b/services/network/restricted_cookie_manager.cc
-index 425426f..c8c10c6 100644
---- a/services/network/restricted_cookie_manager.cc
-+++ b/services/network/restricted_cookie_manager.cc
-@@ -161,7 +161,7 @@
-     const GURL& url,
-     const net::SiteForCookies& site_for_cookies) {
-   std::unique_ptr<CookieAccesses>& entry =
--      recent_cookie_accesses_std::tie(url, site_for_cookies);
-+      recent_cookie_accesses_std::make_pair(url, site_for_cookies);
-   if (!entry) {
-     entry = std::make_unique<CookieAccesses>();
-   }

chromium-96-compiler.patch Deleted

@@ -1,212 +0,0 @@
-From f4d0b0eb899005b4b8b6388e1d8bb82cc0018fc8 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Fri, 1 Oct 2021 12:17:48 +0000
-Subject: PATCH Disable various compiler configs
-
----
- build/config/compiler/BUILD.gn | 98 ++++++----------------------------
- 1 file changed, 17 insertions(+), 81 deletions(-)
-
-diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
-index 673716f..3ff820e 100644
---- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -292,8 +292,6 @@ config("compiler") {
- 
-   configs += 
-     # See the definitions below.
--    ":clang_revision",
--    ":compiler_cpu_abi",
-     ":compiler_codegen",
-     ":compiler_deterministic",
-   
-@@ -532,24 +530,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) ||
-@@ -1240,45 +1220,6 @@ config("compiler_deterministic") {
-     }
-   }
- 
--  # Makes builds independent of absolute file path.
--  if (is_clang && strip_absolute_paths_from_debug_symbols) {
--    # If debug option is given, clang includes $cwd in debug info by default.
--    # For such build, this flag generates reproducible obj files even we use
--    # different build directory like "out/feature_a" and "out/feature_b" if
--    # we build same files with same compile flag.
--    # Other paths are already given in relative, no need to normalize them.
--    if (is_nacl) {
--      # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
--      cflags += 
--        "-Xclang",
--        "-fdebug-compilation-dir",
--        "-Xclang",
--        ".",
--      
--    } else {
--      # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
--      # and -fcoverage-compilation-dir=.
--      cflags +=  "-ffile-compilation-dir=." 
--    }
--    if (!is_win) {
--      # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
--      asmflags =  "-Wa,-fdebug-compilation-dir,." 
--    }
--
--    if (is_win && use_lld) {
--      if (symbol_level == 2 || (is_clang && using_sanitizer)) {
--        # Absolutize source file paths for PDB. Pass the real build directory
--        # if the pdb contains source-level debug information and if linker
--        # reproducibility is not critical.
--        ldflags +=  "/PDBSourcePath:" + rebase_path(root_build_dir) 
--      } else {
--        # Use a fake fixed base directory for paths in the pdb to make the pdb
--        # output fully deterministic and independent of the build directory.
--        ldflags +=  "/PDBSourcePath:o:\fake\prefix" 
--      }
--    }
--  }
--
-   # Tells the compiler not to use absolute paths when passing the default
-   # paths to the tools it invokes. We don't want this because we don't
-   # really need it and it can mess up the goma cache entries.
-@@ -1698,7 +1639,7 @@ config("chromium_code") {
-       defines =  "_HAS_NODISCARD" 
-     }
-   } else {
--    cflags =  "-Wall" 
-+    cflags = 
-     if (treat_warnings_as_errors) {
-       cflags +=  "-Werror" 
- 
-@@ -1707,10 +1648,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.
-@@ -1719,15 +1656,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" 
-@@ -2095,7 +2023,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.
-@@ -2135,7 +2064,8 @@ config("optimize") {
- }
- 
- # Turn off optimizations.
--config("no_optimize") {
-+config("no_optimize") { }
-+config("xno_optimize") {
-   if (is_win) {
-     cflags = 
-       "/Od",  # Disable optimization.
-@@ -2175,7 +2105,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:
-@@ -2208,7 +2139,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:
-@@ -2234,7 +2166,8 @@ config("optimize_speed") {
-   }
- }
- 
--config("optimize_fuzzing") {
-+config("optimize_fuzzing") { }
-+config("xoptimize_fuzzing") {
-   cflags =  "-O1"  + common_optimize_on_cflags
-   rustflags =  "-Copt-level=1" 
-   ldflags = common_optimize_on_ldflags
-@@ -2354,7 +2287,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.
-@@ -2468,7 +2402,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 =

chromium-97-ScrollView-reference.patch Added

@@ -0,0 +1,23 @@
+From ce58517e546f3f3433931609683b5b4e455bbb7f Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Fri, 5 Nov 2021 15:48:05 +0000
+Subject: PATCH GCC: fix undefined reference to ScrollView::SetContents()
+
+---
+ ui/views/controls/scroll_view.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+Index: chromium-98.0.4758.80/ui/views/controls/scroll_view.h
+===================================================================
+--- chromium-98.0.4758.80.orig/ui/views/controls/scroll_view.h
++++ chromium-98.0.4758.80/ui/views/controls/scroll_view.h
+@@ -389,6 +389,9 @@ class VIEWS_EXPORT ScrollView : public V
+ // ScrollView::SetContents<View> template is available with which to link.
+ template View* ScrollView::SetContents<View>(std::unique_ptr<View> a_view);
+ 
++// Required for WebAppUrlHandlerIntentPickerView
++template View* ScrollView::SetContents<View>(std::unique_ptr<View> a_view);
++
+ BEGIN_VIEW_BUILDER(VIEWS_EXPORT, ScrollView, View)
+ VIEW_BUILDER_VIEW_TYPE_PROPERTY(View, Contents)
+ VIEW_BUILDER_PROPERTY(ui::LayerType, ContentsLayerType)

chromium-97-arm-tflite-cast.patch Added

@@ -0,0 +1,26 @@
+vreinterpret_s32_s8() casts int8x8_t to int32x2_t. However, third argument
+of vdotq_lane_s32() is of type int8x8_t.
+
+--- a/third_party/tflite/src/tensorflow/lite/kernels/internal/optimized/depthwiseconv_3x3_filter_common.h
++++ b/third_party/tflite/src/tensorflow/lite/kernels/internal/optimized/depthwiseconv_3x3_filter_common.h
+@@ -129,16 +129,14 @@ inline int32x4_t vdotq_four_lane_s32(int32x4_t acc, int8x16_t lhs,
+                                      int8x16_t rhs, const int lane) {
+   switch (lane) {
+     case 0:
+-      return vdotq_lane_s32(acc, lhs, vreinterpret_s32_s8(vget_low_s8(rhs)), 0);
++      return vdotq_lane_s32(acc, lhs, vget_low_s8(rhs), 0);
+     case 1:
+-      return vdotq_lane_s32(acc, lhs, vreinterpret_s32_s8(vget_low_s8(rhs)), 1);
++      return vdotq_lane_s32(acc, lhs, vget_low_s8(rhs), 1);
+     case 2:
+-      return vdotq_lane_s32(acc, lhs, vreinterpret_s32_s8(vget_high_s8(rhs)),
+-                            0);
++      return vdotq_lane_s32(acc, lhs, vget_high_s8(rhs), 0);
+     case 3:
+     default:
+-      return vdotq_lane_s32(acc, lhs, vreinterpret_s32_s8(vget_high_s8(rhs)),
+-                            1);
++      return vdotq_lane_s32(acc, lhs, vget_high_s8(rhs), 1);
+   }
+ }
+

chromium-98-EnumTable-crash.patch Added

@@ -0,0 +1,76 @@
+diff --git a/components/cast_channel/enum_table.h b/components/cast_channel/enum_table.h
+index 842553a..89de703 100644
+--- a/components/cast_channel/enum_table.h
++++ b/components/cast_channel/enum_table.h
+@@ -8,6 +8,7 @@
+ #include <cstdint>
+ #include <cstring>
+ #include <ostream>
++#include <vector>
+ 
+ #include "base/check_op.h"
+ #include "base/notreached.h"
+@@ -187,7 +188,6 @@ class
+   inline constexpr GenericEnumTableEntry(int32_t value);
+   inline constexpr GenericEnumTableEntry(int32_t value, base::StringPiece str);
+ 
+-  GenericEnumTableEntry(const GenericEnumTableEntry&) = delete;
+   GenericEnumTableEntry& operator=(const GenericEnumTableEntry&) = delete;
+ 
+  private:
+@@ -253,7 +253,6 @@ class EnumTable {
+     constexpr Entry(E value, base::StringPiece str)
+         : GenericEnumTableEntry(static_cast<int32_t>(value), str) {}
+ 
+-    Entry(const Entry&) = delete;
+     Entry& operator=(const Entry&) = delete;
+   };
+ 
+@@ -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())) {
+-        const auto& entry = data_.begin()index;
++        const auto& entry = data_index;
+         if (ANALYZER_ASSUME_TRUE(entry.has_str()))
+           return entry.str();
+       }
+       return absl::nullopt;
+     }
+     return GenericEnumTableEntry::FindByValue(
+-        reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()),
+-        data_.size(), static_cast<int32_t>(value));
++        &data_0, data_.size(), static_cast<int32_t>(value));
+   }
+ 
+   // This overload of GetString is designed for cases where the argument is a
+@@ -348,8 +346,7 @@ class EnumTable {
+   // enum value directly.
+   absl::optional<E> GetEnum(base::StringPiece str) const {
+     auto* entry = GenericEnumTableEntry::FindByString(
+-        reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()),
+-        data_.size(), str);
++        &data_0, data_.size(), str);
+     return entry ? static_cast<E>(entry->value) : absl::optional<E>();
+   }
+ 
+@@ -364,7 +361,7 @@ class EnumTable {
+   // Align the data on a cache line boundary.
+   alignas(64)
+ #endif
+-      std::initializer_list<Entry> data_;
++      const std::vector<Entry> data_;
+   bool is_sorted_;
+ 
+   constexpr EnumTable(std::initializer_list<Entry> data, bool is_sorted)
+@@ -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++) {
+-        const Entry& ei = data.begin()i;
+-        const Entry& ej = data.begin()j;
++        const Entry& ei = datai;
++        const Entry& ej = dataj;
+         DCHECK(ei.value != ej.value)
+             << "Found duplicate enum values at indices " << i << " and " << j;
+         DCHECK(!(ei.has_str() && ej.has_str() && ei.str() == ej.str()))

chromium-98-gtk4-build.patch Added

@@ -0,0 +1,56 @@
+--- a/ui/gtk/gsk.sigs
++++ b/ui/gtk/gsk.sigs
+@@ -1,16 +1,16 @@
+-GskRenderNodeType gsk_render_node_get_node_type(GskRenderNode* node);
++GskRenderNodeType gsk_render_node_get_node_type(const GskRenderNode* node);
+ void gsk_render_node_unref(GskRenderNode* node);
+-GskRenderNode* gsk_transform_node_get_child(GskRenderNode* node);
+-GskRenderNode* gsk_opacity_node_get_child(GskRenderNode* node);
+-GskRenderNode* gsk_color_matrix_node_get_child(GskRenderNode* node);
+-GskRenderNode* gsk_repeat_node_get_child(GskRenderNode* node);
+-GskRenderNode* gsk_clip_node_get_child(GskRenderNode* node);
+-GskRenderNode* gsk_rounded_clip_node_get_child(GskRenderNode* node);
+-GskRenderNode* gsk_shadow_node_get_child(GskRenderNode* node);
+-GskRenderNode* gsk_blur_node_get_child(GskRenderNode* node);
+-GskRenderNode* gsk_debug_node_get_child(GskRenderNode* node);
+-GskRenderNode* gsk_container_node_get_child(GskRenderNode* node, guint idx);
+-GskRenderNode* gsk_gl_shader_node_get_child(GskRenderNode* node, guint idx);
+-guint gsk_container_node_get_n_children(GskRenderNode* node);
+-guint gsk_gl_shader_node_get_n_children(GskRenderNode* node);
+-GdkTexture* gsk_texture_node_get_texture(GskRenderNode* node);
++GskRenderNode* gsk_transform_node_get_child(const GskRenderNode* node);
++GskRenderNode* gsk_opacity_node_get_child(const GskRenderNode* node);
++GskRenderNode* gsk_color_matrix_node_get_child(const GskRenderNode* node);
++GskRenderNode* gsk_repeat_node_get_child(const GskRenderNode* node);
++GskRenderNode* gsk_clip_node_get_child(const GskRenderNode* node);
++GskRenderNode* gsk_rounded_clip_node_get_child(const GskRenderNode* node);
++GskRenderNode* gsk_shadow_node_get_child(const GskRenderNode* node);
++GskRenderNode* gsk_blur_node_get_child(const GskRenderNode* node);
++GskRenderNode* gsk_debug_node_get_child(const GskRenderNode* node);
++GskRenderNode* gsk_container_node_get_child(const GskRenderNode* node, guint idx);
++GskRenderNode* gsk_gl_shader_node_get_child(const GskRenderNode* node, guint idx);
++guint gsk_container_node_get_n_children(const GskRenderNode* node);
++guint gsk_gl_shader_node_get_n_children(const GskRenderNode* node);
++GdkTexture* gsk_texture_node_get_texture(const GskRenderNode* node);
+--- a/ui/gtk/gtk_util.cc
++++ b/ui/gtk/gtk_util.cc
+@@ -705,7 +705,7 @@
+   DCHECK(GtkCheckVersion(4));
+   struct {
+     GskRenderNodeType node_type;
+-    GskRenderNode* (*get_child)(GskRenderNode*);
++    GskRenderNode* (*get_child)(const GskRenderNode*);
+   } constexpr simple_getters = {
+       {GSK_TRANSFORM_NODE, gsk_transform_node_get_child},
+       {GSK_OPACITY_NODE, gsk_opacity_node_get_child},
+@@ -719,8 +719,8 @@
+   };
+   struct {
+     GskRenderNodeType node_type;
+-    guint (*get_n_children)(GskRenderNode*);
+-    GskRenderNode* (*get_child)(GskRenderNode*, guint);
++    guint (*get_n_children)(const GskRenderNode*);
++    GskRenderNode* (*get_child)(const GskRenderNode*, guint);
+   } constexpr container_getters = {
+       {GSK_CONTAINER_NODE, gsk_container_node_get_n_children,
+        gsk_container_node_get_child},

chromium-fix-swiftshader-template.patch Added

@@ -0,0 +1,70 @@
+Index: electron-16.0.9/third_party/swiftshader/third_party/subzero/src/IceInstX8664.cpp
+===================================================================
+--- electron-16.0.9.orig/third_party/swiftshader/third_party/subzero/src/IceInstX8664.cpp	2022-02-16 18:11:13.517899468 +0100
++++ electron-16.0.9/third_party/swiftshader/third_party/subzero/src/IceInstX8664.cpp	2022-02-24 14:35:08.328190810 +0100
+@@ -659,6 +659,7 @@ void emitIASOpTyGPR(const Cfg *Func, Typ
+   }
+ }
+ 
++#if 0
+ template <bool VarCanBeByte, bool SrcCanBeByte>
+ void emitIASRegOpTyGPR(const Cfg *Func, Type Ty, const Variable *Var,
+                        const Operand *Src, const GPREmitterRegOp &Emitter) {
+@@ -697,6 +698,7 @@ void emitIASRegOpTyGPR(const Cfg *Func,
+     llvm_unreachable("Unexpected operand type");
+   }
+ }
++#endif
+ 
+ void emitIASAddrOpTyGPR(const Cfg *Func, Type Ty, const AsmAddress &Addr,
+                         const Operand *Src, const GPREmitterAddrOp &Emitter) {
+Index: electron-16.0.9/third_party/swiftshader/third_party/subzero/src/IceInstX8664.h
+===================================================================
+--- electron-16.0.9.orig/third_party/swiftshader/third_party/subzero/src/IceInstX8664.h	2022-02-16 18:11:13.517899468 +0100
++++ electron-16.0.9/third_party/swiftshader/third_party/subzero/src/IceInstX8664.h	2022-02-24 15:14:53.316809270 +0100
+@@ -576,8 +576,43 @@ void emitIASXmmShift(const Cfg *Func, Ty
+ /// Emit a two-operand (GPR) instruction, where the dest operand is a Variable
+ /// that's guaranteed to be a register.
+ template <bool VarCanBeByte = true, bool SrcCanBeByte = true>
+-void emitIASRegOpTyGPR(const Cfg *Func, Type Ty, const Variable *Dst,
+-                       const Operand *Src, const GPREmitterRegOp &Emitter);
++void emitIASRegOpTyGPR(const Cfg *Func, Type Ty, const Variable *Var,
++                       const Operand *Src, const GPREmitterRegOp &Emitter) {
++  auto *Target = InstX86Base::getTarget(Func);
++  Assembler *Asm = Func->getAssembler<Assembler>();
++  assert(Var->hasReg());
++  // We cheat a little and use GPRRegister even for byte operations.
++  GPRRegister VarReg = VarCanBeByte ? RegX8664::getEncodedGPR(Var->getRegNum())
++                                    : RegX8664::getEncodedGPR(Var->getRegNum());
++  if (const auto *SrcVar = llvm::dyn_cast<Variable>(Src)) {
++    if (SrcVar->hasReg()) {
++      GPRRegister SrcReg = SrcCanBeByte
++                               ? RegX8664::getEncodedGPR(SrcVar->getRegNum())
++                               : RegX8664::getEncodedGPR(SrcVar->getRegNum());
++      (Asm->*(Emitter.GPRGPR))(Ty, VarReg, SrcReg);
++    } else {
++      AsmAddress SrcStackAddr = AsmAddress(SrcVar, Target);
++      (Asm->*(Emitter.GPRAddr))(Ty, VarReg, SrcStackAddr);
++    }
++  } else if (const auto *Mem = llvm::dyn_cast<X86OperandMem>(Src)) {
++    Mem->emitSegmentOverride(Asm);
++    (Asm->*(Emitter.GPRAddr))(Ty, VarReg, AsmAddress(Mem, Asm, Target));
++  } else if (const auto *Imm = llvm::dyn_cast<ConstantInteger32>(Src)) {
++    (Asm->*(Emitter.GPRImm))(Ty, VarReg, AssemblerImmediate(Imm->getValue()));
++  } else if (const auto *Imm = llvm::dyn_cast<ConstantInteger64>(Src)) {
++    assert(Utils::IsInt(32, Imm->getValue()));
++    (Asm->*(Emitter.GPRImm))(Ty, VarReg, AssemblerImmediate(Imm->getValue()));
++  } else if (const auto *Reloc = llvm::dyn_cast<ConstantRelocatable>(Src)) {
++    const auto FixupKind = (Reloc->getName().hasStdString() &&
++                            Reloc->getName().toString() == GlobalOffsetTable)
++                               ? FK_GotPC
++                               : FK_Abs;
++    AssemblerFixup *Fixup = Asm->createFixup(FixupKind, Reloc);
++    (Asm->*(Emitter.GPRImm))(Ty, VarReg, AssemblerImmediate(Fixup));
++  } else {
++    llvm_unreachable("Unexpected operand type");
++  }
++}
+ 
+ /// Instructions of the form x := op(x).
+ template <typename InstX86Base::InstKindX86 K>

chromium-glibc-2.34.patch Deleted

@@ -1,26 +0,0 @@
-diff -up chromium-92.0.4515.107/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.sigstkszfix chromium-92.0.4515.107/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
---- chromium-92.0.4515.107/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.sigstkszfix	2021-07-19 14:47:20.000000000 -0400
-+++ chromium-92.0.4515.107/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc	2021-07-26 17:28:50.155924005 -0400
-@@ -138,7 +139,7 @@
-   // 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<size_t>(16384, SIGSTKSZ);
-
-   // Only set an alternative stack if there isn't already one, or if the current
-   // one is too small.
-From: https://forums.gentoo.org/viewtopic-p-8644495.html
---- a/sandbox/linux/services/credentials.cc
-+++ b/sandbox/linux/services/credentials.cc
-@@ -98,7 +98,9 @@
-   // TODO(crbug.com/1247458) Broken in MSan builds after LLVM f1bb30a4956f.
-   clone_flags |= CLONE_VM | CLONE_VFORK | CLONE_SETTLS;
-
--  char tls_bufPTHREAD_STACK_MIN = {0};
-+  const std::size_t pthread_stack_min = PTHREAD_STACK_MIN;
-+  char tls_bufpthread_stack_min;
-+  memset(tls_buf, 0, pthread_stack_min);
-   tls = tls_buf;
- #endif
-

chromium-missing-include-tuple.patch Added

chromium-third_party-symbolize-missing-include.patch Added

chromium-vaapi.patch Deleted

@@ -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
-@@ -3526,12 +3526,12 @@
-      flag_descriptions::kWebXrForceRuntimeDescription, kOsDesktop,
-      MULTI_VALUE_TYPE(kWebXrForceRuntimeChoices)},
- #endif  // ENABLE_VR
--#if BUILDFLAG(IS_CHROMEOS_ASH)
-+#if BUILDFLAG(IS_CHROMEOS_ASH) || (defined(OS_LINUX) && !defined(OS_ANDROID))
-     {"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) || (defined(OS_LINUX) && !defined(OS_ANDROID))
-     {"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
-@@ -3704,12 +3704,24 @@
-     "Settings. "
-     "See go/betterAM";
-
-+#endif
-+
-+// Chrome OS and Linux --------------------------------------------------------
-+
-+#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 BUILDFLAG(IS_CHROMEOS_ASH)
-+
- 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
-@@ -2138,9 +2138,21 @@
- extern const char kAccountManagementFlowsV2Name;
- extern const char kAccountManagementFlowsV2Description;
-
-+#endif
-+
-+// Chrome OS and Linux --------------------------------------------------------
-+
-+#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)
-+
-+// Chrome OS ------------------------------------------------------------------
-+
- extern const char kAllowDisableMouseAccelerationName;
- extern const char kAllowDisableMouseAccelerationDescription;
-

chromium-webrtc-stats-missing-vector.patch Added

gcc-enable-lto.patch Changed

system-libdrm.patch Changed

@@ -1,6 +1,9 @@
---- a/build/linux/unbundle/libdrm.gn
-+++ b/build/linux/unbundle/libdrm.gn
-@@ -12,6 +12,9 @@
+Index: chromium-98.0.4758.80/build/linux/unbundle/libdrm.gn
+===================================================================
+--- chromium-98.0.4758.80.orig/build/linux/unbundle/libdrm.gn
++++ chromium-98.0.4758.80/build/linux/unbundle/libdrm.gn
+@@ -11,7 +11,10 @@ pkg_config("system_libdrm") {
+ 
  shim_headers("libdrm_shim") {
    root_path = "src/include"
 -  headers =  "drm.h" 
@@ -9,5 +12,44 @@
 +    "drm_fourcc.h",
 +  
  }
-
+ 
  source_set("libdrm") {
+Index: chromium-98.0.4758.80/ui/ozone/platform/drm/gpu/crtc_controller.h
+===================================================================
+--- chromium-98.0.4758.80.orig/ui/ozone/platform/drm/gpu/crtc_controller.h
++++ chromium-98.0.4758.80/ui/ozone/platform/drm/gpu/crtc_controller.h
+@@ -11,7 +11,7 @@
+ 
+ #include "base/memory/weak_ptr.h"
+ #include "base/trace_event/traced_value.h"
+-#include "third_party/libdrm/src/include/drm/drm_fourcc.h"
++#include <drm_fourcc.h>
+ #include "ui/gfx/swap_result.h"
+ #include "ui/ozone/platform/drm/common/scoped_drm_types.h"
+ #include "ui/ozone/platform/drm/gpu/drm_overlay_plane.h"
+Index: chromium-98.0.4758.80/ui/ozone/platform/drm/gpu/hardware_display_controller.cc
+===================================================================
+--- chromium-98.0.4758.80.orig/ui/ozone/platform/drm/gpu/hardware_display_controller.cc
++++ chromium-98.0.4758.80/ui/ozone/platform/drm/gpu/hardware_display_controller.cc
+@@ -20,7 +20,7 @@
+ #include "base/trace_event/trace_conversion_helper.h"
+ #include "base/trace_event/trace_event.h"
+ #include "base/trace_event/traced_value.h"
+-#include "third_party/libdrm/src/include/drm/drm_fourcc.h"
++#include <drm_fourcc.h>
+ #include "third_party/skia/include/core/SkCanvas.h"
+ #include "third_party/skia/include/core/SkImage.h"
+ #include "ui/gfx/geometry/point.h"
+Index: chromium-98.0.4758.80/media/gpu/chromeos/video_decoder_pipeline_unittest.cc
+===================================================================
+--- chromium-98.0.4758.80.orig/media/gpu/chromeos/video_decoder_pipeline_unittest.cc
++++ chromium-98.0.4758.80/media/gpu/chromeos/video_decoder_pipeline_unittest.cc
+@@ -23,7 +23,7 @@
+ #include "media/gpu/chromeos/mailbox_video_frame_converter.h"
+ #include "testing/gmock/include/gmock/gmock.h"
+ #include "testing/gtest/include/gtest/gtest.h"
+-#include "third_party/libdrm/src/include/drm/drm_fourcc.h"
++#include <drm_fourcc.h>
+ 
+ #if BUILDFLAG(IS_CHROMEOS_ASH)
+ // gn check does not account for BUILDFLAG(), so including this header will

INSTALL.sh Changed

@@ -53,13 +53,6 @@
     cp -a {} "${STAGEDIR}/${INSTALLDIR}/locales/" \;
 find "${STAGEDIR}/${INSTALLDIR}/locales" -type f -print -exec chmod 644 {} \;
 
-# MEI Preload
-if  -f "${OUTPUTDIR}/MEIPreload/manifest.json" ; then
-    install -m 755 -d "${STAGEDIR}/${INSTALLDIR}/MEIPreload/"
-    install -m 644 "${OUTPUTDIR}/MEIPreload/manifest.json" "${STAGEDIR}/${INSTALLDIR}/MEIPreload/"
-    install -m 644 "${OUTPUTDIR}/MEIPreload/preloaded_data.pb" "${STAGEDIR}/${INSTALLDIR}/MEIPreload/"
-fi
-
 # ANGLE
 if  -f "${OUTPUTDIR}/libEGL.so" ; then
     for file in libEGL.so libGLESv2.so;
@@ -93,10 +86,9 @@
     buildfile="${OUTPUTDIR}/${file}"
     install -m ${SHLIB_PERMS} "${buildfile}" "${STAGEDIR}/${INSTALLDIR}/${file}"
 fi
-if  -f "${OUTPUTDIR}/vk_swiftshader_icd.json" ; then
+sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > ${OUTPUTDIR}/vk_swiftshader_icd.json
 # Install the ICD json file to point ANGLE to libvk_swiftshader.so
-    install -m 644 "${OUTPUTDIR}/vk_swiftshader_icd.json" "${STAGEDIR}/${INSTALLDIR}/"
-fi
+install -m 644 "${OUTPUTDIR}/vk_swiftshader_icd.json" "${STAGEDIR}/${INSTALLDIR}/"
 
 # default apps
 if  -d "${OUTPUTDIR}/default_apps" ; then

chrome-wrapper Added

chromium-96.0.4664.110.tar.xz -> chromium-100.0.4896.127.tar.xz Changed

esbuild.tar.gz Added

Changes of Revision 21