Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 22

chromium-ffmpeg-extra.changes Changed

@@ -1,9 +1,188 @@
 -------------------------------------------------------------------
+Thu Jul 14 16:38:50 UTC 2022 - Carsten Ziepke <kieltux@gmail.com>
+
+- Rebase chromium 103.0.5060.114 for use as chromium-ffmpeg-extra
+  - Fixes problems with audio and youtube video playback
+
+-------------------------------------------------------------------
+Sat Jul  9 12:52:33 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- Chromium 103.0.5060.114 (boo#1201216)
+  * CVE-2022-2294: Heap buffer overflow in WebRTC
+  * CVE-2022-2295: Type Confusion in V8
+  * CVE-2022-2296: Use after free in Chrome OS Shell
+
+-------------------------------------------------------------------
+Thu Jul  7 18:07:43 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- Chromium 103.0.5060.66
+  * no upstream release notes
+
+-------------------------------------------------------------------
+Sat Jun 25 10:43:48 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>
+
+- Chromium 103.0.5060.53 (boo#1200783)
+  * CVE-2022-2156: Use after free in Base
+  * CVE-2022-2157: Use after free in Interest groups
+  * CVE-2022-2158: Type Confusion in V8
+  * CVE-2022-2160: Insufficient policy enforcement in DevTools
+  * CVE-2022-2161: Use after free in WebApp Provider
+  * CVE-2022-2162: Insufficient policy enforcement in File System API
+  * CVE-2022-2163: Use after free in Cast UI and Toolbar
+  * CVE-2022-2164: Inappropriate implementation in Extensions API
+  * CVE-2022-2165: Insufficient data validation in URL formatting
+- Added patches:
+  * chromium-103-FrameLoadRequest-type.patch
+  * chromium-103-SubstringSetMatcher-packed.patch
+  * chromium-103-VirtualCursor-std-layout.patch
+  * chromium-103-compiler.patch
+- Removed patches:
+  * chromium-102-compiler.patch
+  * chromium-91-sql-standard-layout-type.patch
+  * chromium-101-libxml-unbundle.patch
+  * chromium-102-fenced_frame_utils-include.patch
+  * chromium-102-swiftshader-template-instantiation.patch
+  * chromium-102-symbolize-include.patch
+  * chromium-97-arm-tflite-cast.patch
+  * chromium-97-ScrollView-reference.patch
+
+-------------------------------------------------------------------
+Fri Jun 10 15:35:20 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- Chromium 102.0.5005.115 (boo#1200423)
+  * CVE-2022-2007: Use after free in WebGPU
+  * CVE-2022-2008: Out of bounds memory access in WebGL
+  * CVE-2022-2010: Out of bounds read in compositing
+  * CVE-2022-2011: Use after free in ANGLE
+
+-------------------------------------------------------------------
+Wed Jun  8 13:40:43 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>
+
+- Switch to GTK4 on TW and Leap 15.4+ (boo#1200139)
+
+-------------------------------------------------------------------
+Wed Jun  1 09:43:54 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>
+
+- Disable ARM control flow integrity, it causes build issues
+  at the moment
+- Try a different SVG (black logo on GNOME)
+- Removed patches:
+  * chromium-third_party-symbolize-missing-include.patch
+  (replaced by chromium-102-symbolize-include.patch)
+
+-------------------------------------------------------------------
+Fri May 27 19:40:42 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>
+
+- Chromium 102.0.5001.61 (boo#1199893)
+  * CVE-2022-1853: Use after free in Indexed DB
+  * CVE-2022-1854: Use after free in ANGLE
+  * CVE-2022-1855: Use after free in Messaging
+  * CVE-2022-1856: Use after free in User Education
+  * CVE-2022-1857: Insufficient policy enforcement in File System API
+  * CVE-2022-1858: Out of bounds read in DevTools
+  * CVE-2022-1859: Use after free in Performance Manager
+  * CVE-2022-1860: Use after free in UI Foundations
+  * CVE-2022-1861: Use after free in Sharing
+  * CVE-2022-1862: Inappropriate implementation in Extensions
+  * CVE-2022-1863: Use after free in Tab Groups
+  * CVE-2022-1864: Use after free in WebApp Installs
+  * CVE-2022-1865: Use after free in Bookmarks
+  * CVE-2022-1866: Use after free in Tablet Mode
+  * CVE-2022-1867: Insufficient validation of untrusted input in Data Transfer
+  * CVE-2022-1868: Inappropriate implementation in Extensions API
+  * CVE-2022-1869: Type Confusion in V8
+  * CVE-2022-1870: Use after free in App Service
+  * CVE-2022-1871: Insufficient policy enforcement in File System API
+  * CVE-2022-1872: Insufficient policy enforcement in Extensions API
+  * CVE-2022-1873: Insufficient policy enforcement in COOP
+  * CVE-2022-1874: Insufficient policy enforcement in Safe Browsing
+  * CVE-2022-1875: Inappropriate implementation in PDF
+  * CVE-2022-1876: Heap buffer overflow in DevTools
+- Added patches:
+  * chromium-102-compiler.patch
+  * chromium-102-fenced_frame_utils-include.patch
+  * chromium-102-regex_pattern-array.patch
+  * chromium-102-swiftshader-template-instantiation.patch
+  * chromium-102-symbolize-include.patch
+  * ffmpeg-new-channel-layout.patch
+- Removed patches:
+  * chromium-100-compiler.patch
+  * chromium-80-QuicStreamSendBuffer-deleted-move-constructor.patch
+  * chromium-95-quiche-include.patch
+  * chromium-fix-swiftshader-template.patch
+  * chromium-missing-include-tuple.patch
+  * chromium-webrtc-stats-missing-vector.patch
+  * chromium-101-segmentation_platform-type.patch
+
+-------------------------------------------------------------------
+Sun May 15 09:03:28 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- Chromium 101.0.4951.67
+  * fixes for other platforms
+
+-------------------------------------------------------------------
+Wed May 11 06:33:01 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- Chromium 101.0.4951.64 (boo#1199409)
+  * CVE-2022-1633: Use after free in Sharesheet
+  * CVE-2022-1634: Use after free in Browser UI
+  * CVE-2022-1635: Use after free in Permission Prompts
+  * CVE-2022-1636: Use after free in Performance APIs
+  * CVE-2022-1637: Inappropriate implementation in Web Contents
+  * CVE-2022-1638: Heap buffer overflow in V8 Internationalization
+  * CVE-2022-1639: Use after free in ANGLE
+  * CVE-2022-1640: Use after free in Sharing
+  * CVE-2022-1641: Use after free in Web UI Diagnostics
+
+-------------------------------------------------------------------
+Wed May  4 09:34:58 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>
+
+- Chromium 101.0.4951.54 (boo#1199118)
+- Chromium 101.0.4951.41 (boo#1198917)
+  * CVE-2022-1477: Use after free in Vulkan
+  * CVE-2022-1478: Use after free in SwiftShader
+  * CVE-2022-1479: Use after free in ANGLE
+  * CVE-2022-1480: Use after free in Device API
+  * CVE-2022-1481: Use after free in Sharing
+  * CVE-2022-1482: Inappropriate implementation in WebGL
+  * CVE-2022-1483: Heap buffer overflow in WebGPU
+  * CVE-2022-1484: Heap buffer overflow in Web UI Settings
+  * CVE-2022-1485: Use after free in File System API
+  * CVE-2022-1486: Type Confusion in V8
+  * CVE-2022-1487: Use after free in Ozone
+  * CVE-2022-1488: Inappropriate implementation in Extensions API
+  * CVE-2022-1489: Out of bounds memory access in UI Shelf
+  * CVE-2022-1490: Use after free in Browser Switcher
+  * CVE-2022-1491: Use after free in Bookmarks
+  * CVE-2022-1492: Insufficient data validation in Blink Editing
+  * CVE-2022-1493: Use after free in Dev Tools
+  * CVE-2022-1494: Insufficient data validation in Trusted Types
+  * CVE-2022-1495: Incorrect security UI in Downloads
+  * CVE-2022-1496: Use after free in File Manager
+  * CVE-2022-1497: Inappropriate implementation in Input
+  * CVE-2022-1498: Inappropriate implementation in HTML Parser
+  * CVE-2022-1499: Inappropriate implementation in WebAuthentication
+  * CVE-2022-1500: Insufficient data validation in Dev Tools
+  * CVE-2022-1501: Inappropriate implementation in iframe
+- Added patches:
+  * chromium-101-libxml-unbundle.patch
+  * chromium-101-segmentation_platform-type.patch
+- Removed patches:
+  * chromium-100-SCTHashdanceMetadata-move.patch
+  * chromium-100-GLImplementationParts-constexpr.patch
+  * chromium-100-macro-typo.patch
+  
+-------------------------------------------------------------------
 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
 
 -------------------------------------------------------------------
+Thu Apr 21 10:04:22 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>
+
+- Fixes for go 1.18
+
+-------------------------------------------------------------------
 Fri Apr 15 07:29:35 UTC 2022 - Andreas Stieger <andreas.stieger@gmx.de>
 
 - Chromium 100.0.4896.127 (boo#1198509)

chromium-ffmpeg-extra.spec Changed

@@ -20,11 +20,16 @@
 %define outputdir out
 # bsc#1108175
 %define __provides_exclude ^lib.*\\.so.*$
-%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400
+%if 0%{?suse_version} >= 1550
 %bcond_without system_icu
 %else
 %bcond_with system_icu
 %endif
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400
+%bcond_without gtk4
+%else
+%bcond_with gtk4
+%endif
 %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150200
 %bcond_without pipewire
 %else
@@ -48,7 +53,7 @@
 # Chromium built with GCC 11 and LTO enabled crashes (boo#1194055)
 %bcond_with lto
 Name:           chromium-ffmpeg-extra
-Version:        100.0.4896.127
+Version:        103.0.5060.114
 Release:        0
 Summary:        Google's open source browser project
 License:        BSD-3-Clause AND LGPL-2.1-or-later
@@ -56,6 +61,7 @@
 Source0:        https://commondatastorage.googleapis.com/chromium-browser-official/%{rname}-%{version}.tar.xz
 Source1:        esbuild.tar.gz
 Source3:        README.SUSE
+Source4:        ffmpeg-new-channel-layout.patch
 # Toolchain definitions
 Source30:       master_preferences
 Source104:      chromium-symbolic.svg
@@ -82,33 +88,26 @@
 Patch11:        chromium-lp151-old-drm.patch
 # gentoo/fedora/arch patchset
 Patch12:        chromium-78-protobuf-RepeatedPtrField-export.patch
-Patch13:        chromium-80-QuicStreamSendBuffer-deleted-move-constructor.patch
-Patch15:        chromium-100-compiler.patch
+Patch15:        chromium-103-compiler.patch
 Patch17:        chromium-86-ImageMemoryBarrierData-init.patch
 Patch21:        chromium-gcc11.patch
 Patch40:        chromium-91-java-only-allowed-in-android-builds.patch
-Patch46:        chromium-91-sql-standard-layout-type.patch
 Patch50:        chromium-clang-nomerge.patch
 Patch62:        chromium-93-ffmpeg-4.4.patch
 Patch63:        chromium-ffmpeg-lp152.patch
 Patch65:        chromium-94-sql-no-assert.patch
+Patch68:        chromium-94-ffmpeg-roll.patch
 Patch69:        chromium-93-InkDropHost-crash.patch
-Patch72:        chromium-95-quiche-include.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
+Patch98:        chromium-102-regex_pattern-array.patch
+Patch101:       chromium-103-FrameLoadRequest-type.patch
+Patch102:       chromium-103-SubstringSetMatcher-packed.patch
+Patch103:       chromium-103-VirtualCursor-std-layout.patch
+Patch201:       chromium-86-fix-vaapi-on-intel.patch
 # PATCH-FIX-SUSE: allow prop codecs to be set with chromium branding
-Patch102:       chromium-prop-codecs.patch
+Patch202:       chromium-prop-codecs.patch
 BuildRequires:  SDL-devel
 BuildRequires:  bison
 BuildRequires:  cups-devel
@@ -116,6 +115,7 @@
 BuildRequires:  elfutils
 BuildRequires:  fdupes
 BuildRequires:  flex
+BuildRequires:  git
 BuildRequires:  gn >= 0.1807
 BuildRequires:  gperf
 BuildRequires:  hicolor-icon-theme
@@ -153,8 +153,6 @@
 BuildRequires:  pkgconfig(flac++)
 BuildRequires:  pkgconfig(gbm)
 BuildRequires:  pkgconfig(glib-2.0)
-BuildRequires:  pkgconfig(gtk+-2.0)
-BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(hunspell)
 BuildRequires:  pkgconfig(imlib2)
 BuildRequires:  pkgconfig(jack)
@@ -243,6 +241,12 @@
 %if %{with system_zlib}
 BuildRequires:  pkgconfig(zlib)
 %endif
+%if %{with gtk4}
+BuildRequires:  pkgconfig(atk-bridge-2.0)
+BuildRequires:  pkgconfig(gtk4)
+%else
+BuildRequires:  pkgconfig(gtk+-3.0)
+%endif
 %if %{with clang}
 %if %{?suse_version} < 1550
 BuildRequires:  clang12
@@ -277,6 +281,10 @@
 %prep
 %setup -q -n %{rname}-%{version}
 %autopatch -p1
+%if 0%{?suse_version} >= 1550
+patch -R -p1 < %{PATCH68}
+%endif
+patch -R -p1 < %{SOURCE4}
 
 %build
 # esbuild
@@ -299,7 +307,7 @@
 ln -s %{_bindir}/eu-strip buildtools/third_party/eu-strip/bin/eu-strip
 
 # python3
-mkdir $HOME/bin
+mkdir -p $HOME/bin
 export PYTHON=python3
 ln -sfn %{_bindir}/$PYTHON $HOME/bin/python
 export PATH="$HOME/bin/:$PATH"
@@ -364,6 +372,7 @@
     third_party/ced
     third_party/cld_3
     third_party/closure_compiler
+    third_party/cpuinfo
     third_party/crashpad
     third_party/crashpad/crashpad/third_party/lss
     third_party/crashpad/crashpad/third_party/zlib
@@ -372,7 +381,6 @@
     third_party/dav1d
     third_party/dawn
     third_party/dawn/third_party
-    third_party/dawn/third_party/tint/src/ast
     third_party/depot_tools
     third_party/depot_tools/third_party/six
     third_party/devscripts
@@ -401,7 +409,9 @@
     third_party/fdlibm
     third_party/fft2d
     third_party/flatbuffers
+    third_party/fp16
     third_party/fusejs/dist
+    third_party/fxdiv
     third_party/gemmlowp
     third_party/google_input_tools
     third_party/google_input_tools/third_party/closure_library
@@ -438,7 +448,6 @@
     third_party/libx11/src
     third_party/libxcb-keysyms/keysyms
     third_party/libxml/chromium
-    third_party/libXNVCtrl
     third_party/libyuv
     third_party/libzip
     third_party/lottie
@@ -457,7 +466,6 @@
     third_party/node
     third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
     third_party/one_euro_filter
-    third_party/opencv
     third_party/openscreen
     third_party/openscreen/src/third_party/mozilla
     third_party/openscreen/src/third_party/tinycbor/src/src
@@ -481,6 +489,7 @@
     third_party/private_membership
     third_party/protobuf
     third_party/protobuf/third_party/six
+    third_party/pthreadpool
     third_party/pyjson5
     third_party/qcms
     third_party/rnnoise
@@ -501,14 +510,14 @@
     third_party/swiftshader/third_party/llvm-10.0
     third_party/swiftshader/third_party/llvm-subzero
     third_party/swiftshader/third_party/marl
-    third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1
+    third_party/swiftshader/third_party/SPIRV-Headers
+    third_party/swiftshader/third_party/SPIRV-Tools
     third_party/swiftshader/third_party/subzero
     third_party/tensorflow-text
     third_party/tflite
     third_party/tflite/src/third_party/eigen3
     third_party/tflite/src/third_party/fft2d
     third_party/ukey2
-    third_party/usrsctp
     third_party/utf
     third_party/vulkan
     third_party/wayland
@@ -528,6 +537,7 @@
     third_party/wuffs
     third_party/x11proto
     third_party/xcbproto
+    third_party/xnnpack
     third_party/zlib/google

chromium-100-GLImplementationParts-constexpr.patch Deleted

@@ -1,92 +0,0 @@
-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-SCTHashdanceMetadata-move.patch Deleted

@@ -1,35 +0,0 @@
-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 Deleted

@@ -1,220 +0,0 @@
-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 Deleted

chromium-102-regex_pattern-array.patch Added

chromium-103-FrameLoadRequest-type.patch Added

@@ -0,0 +1,26 @@
+From 491bf840da4f76fa3591cc0aa2f4c19cdbe57ec4 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Thu, 12 May 2022 11:58:29 +0000
+Subject: PATCH GCC: fix ambiguous references in blink::FrameLoadRequest
+
+Add namespace to avoid confusion.
+---
+ third_party/blink/renderer/core/loader/frame_load_request.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/third_party/blink/renderer/core/loader/frame_load_request.h b/third_party/blink/renderer/core/loader/frame_load_request.h
+index 444b25c..a86814d 100644
+--- a/third_party/blink/renderer/core/loader/frame_load_request.h
++++ b/third_party/blink/renderer/core/loader/frame_load_request.h
+@@ -179,7 +179,7 @@ struct CORE_EXPORT FrameLoadRequest {
+     impression_ = impression;
+   }
+ 
+-  const absl::optional<Impression>& Impression() const { return impression_; }
++  const absl::optional<blink::Impression>& Impression() const { return impression_; }
+ 
+   bool CanDisplay(const KURL&) const;
+ 
+-- 
+2.35.1
+

chromium-103-SubstringSetMatcher-packed.patch Added

@@ -0,0 +1,70 @@
+From 3d274856e792a361336eb4ae1670bc9c1905f0cb Mon Sep 17 00:00:00 2001
+From: Steinar H. Gunderson <sesse@chromium.org>
+Date: Thu, 12 May 2022 16:42:40 +0200
+Subject: PATCH Make AhoCorasickNode 4-aligned.
+
+This should fix an issue where std::vector could allocate unaligned
+memory for AhoCorasickNode, and we'd then return a pointer to
+inline_edges, where a caller would expect the pointer to be aligned
+but it wasn't.
+
+Change-Id: Id9dff044c61f8e46062c63b8480b18ebc68c4862
+---
+
+diff --git a/base/substring_set_matcher/substring_set_matcher.cc b/base/substring_set_matcher/substring_set_matcher.cc
+index e110047..ef0b750 100644
+--- a/base/substring_set_matcher/substring_set_matcher.cc
++++ b/base/substring_set_matcher/substring_set_matcher.cc
+@@ -424,7 +424,12 @@
+     edges_.inline_edgesnum_edges() = AhoCorasickEdge{label, node};
+     if (label == kFailureNodeLabel) {
+       // Make sure that kFailureNodeLabel is first.
+-      std::swap(edges_.inline_edges0, edges_.inline_edgesnum_edges());
++      // NOTE: We don't use std::swap here, because GCC
++      // doesn't understand that inline_edges is 4-aligned
++      // and gives a warning.
++      AhoCorasickEdge temp = edges_.inline_edges0;
++      edges_.inline_edges0 = edges_.inline_edgesnum_edges();
++      edges_.inline_edgesnum_edges() = temp;
+     }
+     --num_free_edges_;
+     return;
+diff --git a/base/substring_set_matcher/substring_set_matcher.cc b/base/substring_set_matcher/substring_set_matcher.cc
+index e110047..ef0b750 100644
+--- a/base/substring_set_matcher/substring_set_matcher.h
++++ b/base/substring_set_matcher/substring_set_matcher.h
+@@ -154,8 +154,9 @@
+   static constexpr uint32_t kEmptyLabel = 0x103;
+ 
+   // A node in the trie, packed tightly together so that it occupies 12 bytes
+-  // (both on 32- and 64-bit platforms).
+-  class AhoCorasickNode {
++  // (both on 32- and 64-bit platforms), but aligned to at least 4 (see the
++  // comment on edges_).
++  class alignas(AhoCorasickEdge) AhoCorasickNode {
+    public:
+     AhoCorasickNode();
+     ~AhoCorasickNode();
+@@ -178,6 +179,10 @@
+     NodeID GetEdgeNoInline(uint32_t label) const;
+     void SetEdge(uint32_t label, NodeID node);
+     const AhoCorasickEdge* edges() const {
++      // NOTE: Returning edges_.inline_edges here is fine, because it's
++      // the first thing in the struct (see the comment on edges_).
++      DCHECK_EQ(0u, reinterpret_cast<uintptr_t>(edges_.inline_edges) %
++                        alignof(AhoCorasickEdge));
+       return edges_capacity_ == 0 ? edges_.inline_edges : edges_.edges;
+     }
+ 
+@@ -258,6 +263,11 @@
+     // in the first slot if it exists (ie., is not equal to kRootID), since we
+     // need to access that label during every single node we look at during
+     // traversal.
++    //
++    // NOTE: Keep this the first member in the struct, so that inline_edges gets
++    // 4-aligned (since the class is marked as such, despite being packed.
++    // Otherwise, edges() can return an unaligned pointer marked as aligned
++    // (the unalignedness gets lost).
+     static constexpr int kNumInlineEdges = 2;
+     union {
+       // Out-of-line edge storage, having room for edges_capacity_ elements.

chromium-103-VirtualCursor-std-layout.patch Added

@@ -0,0 +1,231 @@
+From 144479ad7b4287bee4067f95e4218f614798a865 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Sun, 16 Jan 2022 19:15:26 +0000
+Subject: PATCH sql: make VirtualCursor standard layout type
+
+sql::recover::VirtualCursor needs to be a standard layout type, but
+has members of type std::unique_ptr. However, std::unique_ptr is not
+guaranteed to be standard layout. Compiling with clang combined with
+gcc-11 libstdc++ fails because of this.
+
+Bug: 1189788
+Change-Id: Ia6dc388cc5ef1c0f2afc75f8ca45b9f12687ca9c
+---
+
+diff --git a/sql/recover_module/btree.cc b/sql/recover_module/btree.cc
+index cc9420e5..f12d8fa 100644
+--- a/sql/recover_module/btree.cc
++++ b/sql/recover_module/btree.cc
+@@ -136,16 +136,22 @@
+               "Move the destructor to the .cc file if it's non-trival");
+ #endif  // !DCHECK_IS_ON()
+ 
+-LeafPageDecoder::LeafPageDecoder(DatabasePageReader* db_reader) noexcept
+-    : page_id_(db_reader->page_id()),
+-      db_reader_(db_reader),
+-      cell_count_(ComputeCellCount(db_reader)),
+-      next_read_index_(0),
+-      last_record_size_(0) {
++LeafPageDecoder::LeafPageDecoder() noexcept = default;
++
++void LeafPageDecoder::Initialize(DatabasePageReader* db_reader) {
++  page_id_ = db_reader->page_id();
++  db_reader_ = db_reader;
++  cell_count_ = ComputeCellCount(db_reader);
++  next_read_index_ = 0;
++  last_record_size_ = 0;
+   DCHECK(IsOnValidPage(db_reader));
+   DCHECK(DatabasePageReader::IsValidPageId(page_id_));
+ }
+ 
++void LeafPageDecoder::Reset() {
++  db_reader_ = nullptr;
++}
++
+ 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 eaa087a5..df0e0c9 100644
+--- a/sql/recover_module/btree.h
++++ b/sql/recover_module/btree.h
+@@ -101,9 +101,7 @@
+  public:
+   // Creates a decoder for a DatabasePageReader's last read page.
+   //
+-  // |db_reader| must have been used to read an inner page of a table B-tree.
+-  // |db_reader| must outlive this instance.
+-  explicit LeafPageDecoder(DatabasePageReader* db_reader) noexcept;
++  LeafPageDecoder() noexcept;
+   ~LeafPageDecoder() noexcept = default;
+ 
+   LeafPageDecoder(const LeafPageDecoder&) = delete;
+@@ -151,6 +149,17 @@
+   // read as long as CanAdvance() returns true.
+   bool TryAdvance();
+ 
++  // Initialize with DatabasePageReader
++  // |db_reader| must have been used to read an inner page of a table B-tree.
++  // |db_reader| must outlive this instance.
++  void Initialize(DatabasePageReader* db_reader);
++
++  // Reset internal DatabasePageReader
++  void Reset();
++
++  // True if DatabasePageReader is valid
++  bool IsValid() { return (db_reader_ != nullptr); }
++
+   // True if the given reader may point to an inner page in a table B-tree.
+   //
+   // The last ReadPage() call on |db_reader| must have succeeded.
+@@ -164,14 +173,14 @@
+   static int ComputeCellCount(DatabasePageReader* db_reader);
+ 
+   // The number of the B-tree page this reader is reading.
+-  const int64_t page_id_;
++  int64_t page_id_;
+   // Used to read the tree page.
+   //
+   // Raw pointer usage is acceptable because this instance's owner is expected
+   // to ensure that the DatabasePageReader outlives this.
+-  DatabasePageReader* const db_reader_;
++  DatabasePageReader* db_reader_;
+   // Caches the ComputeCellCount() value for this reader's page.
+-  const int cell_count_ = ComputeCellCount(db_reader_);
++  int cell_count_;
+ 
+   // The reader's cursor state.
+   //
+diff --git a/sql/recover_module/cursor.cc b/sql/recover_module/cursor.cc
+index 4f827ed..240de499 100644
+--- a/sql/recover_module/cursor.cc
++++ b/sql/recover_module/cursor.cc
+@@ -28,7 +28,7 @@
+ int VirtualCursor::First() {
+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+   inner_decoders_.clear();
+-  leaf_decoder_ = nullptr;
++  leaf_decoder_.Reset();
+ 
+   AppendPageDecoder(table_->root_page_id());
+   return Next();
+@@ -38,18 +38,18 @@
+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+   record_reader_.Reset();
+ 
+-  while (!inner_decoders_.empty() || leaf_decoder_.get()) {
+-    if (leaf_decoder_.get()) {
+-      if (!leaf_decoder_->CanAdvance()) {
++  while (!inner_decoders_.empty() || leaf_decoder_.IsValid()) {
++    if (leaf_decoder_.IsValid()) {
++      if (!leaf_decoder_.CanAdvance()) {
+         // The leaf has been exhausted. Remove it from the DFS stack.
+-        leaf_decoder_ = nullptr;
++        leaf_decoder_.Reset();
+         continue;
+       }
+-      if (!leaf_decoder_->TryAdvance())
++      if (!leaf_decoder_.TryAdvance())
+         continue;
+ 
+-      if (!payload_reader_.Initialize(leaf_decoder_->last_record_size(),
+-                                      leaf_decoder_->last_record_offset())) {
++      if (!payload_reader_.Initialize(leaf_decoder_.last_record_size(),
++                                      leaf_decoder_.last_record_offset())) {
+         continue;
+       }
+       if (!record_reader_.Initialize())
+@@ -101,13 +101,13 @@
+ int64_t VirtualCursor::RowId() {
+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+   DCHECK(record_reader_.IsInitialized());
+-  DCHECK(leaf_decoder_.get());
+-  return leaf_decoder_->last_record_rowid();
++  DCHECK(leaf_decoder_.IsValid());
++  return leaf_decoder_.last_record_rowid();
+ }
+ 
+ void VirtualCursor::AppendPageDecoder(int page_id) {
+   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+-  DCHECK(leaf_decoder_.get() == nullptr)
++  DCHECK(!leaf_decoder_.IsValid())
+       << __func__
+       << " must only be called when the current path has no leaf decoder";
+ 
+@@ -115,7 +115,7 @@
+     return;
+ 
+   if (LeafPageDecoder::IsOnValidPage(&db_reader_)) {
+-    leaf_decoder_ = std::make_unique<LeafPageDecoder>(&db_reader_);
++    leaf_decoder_.Initialize(&db_reader_);
+     return;
+   }
+ 
+diff --git a/sql/recover_module/cursor.h b/sql/recover_module/cursor.h
+index 845b785..cc4e85f8 100644
+--- a/sql/recover_module/cursor.h
++++ b/sql/recover_module/cursor.h
+@@ -130,7 +130,7 @@
+   std::vector<std::unique_ptr<InnerPageDecoder>> inner_decoders_;
+ 
+   // Decodes the leaf page containing records.
+-  std::unique_ptr<LeafPageDecoder> leaf_decoder_;
++  LeafPageDecoder leaf_decoder_;
+ 
+   SEQUENCE_CHECKER(sequence_checker_);
+ };
+diff --git a/sql/recover_module/pager.cc b/sql/recover_module/pager.cc
+index 58e75de..69d98cef 100644
+--- a/sql/recover_module/pager.cc
++++ b/sql/recover_module/pager.cc
+@@ -23,8 +23,7 @@
+               "ints are not appropriate for representing page IDs");
+ 
+ DatabasePageReader::DatabasePageReader(VirtualTable* table)
+-    : page_data_(std::make_unique<uint8_t>(table->page_size())),
+-      table_(table) {
++    : page_data_(table->page_size()), table_(table) {
+   DCHECK(table != nullptr);
+   DCHECK(IsValidPageSize(table->page_size()));
+ }
+@@ -58,7 +57,7 @@
+                 "The |read_offset| computation above may overflow");
+ 
+   int sqlite_status =
+-      RawRead(sqlite_file, read_size, read_offset, page_data_.get());
++      RawRead(sqlite_file, read_size, read_offset, page_data_.data());
+ 
+   // |page_id_| needs to be set to kInvalidPageId if the read failed.
+   // Otherwise, future ReadPage() calls with the previous |page_id_| value

chromium-103-compiler.patch Added

@@ -0,0 +1,235 @@
+From 307a0f63dd9b118f4b8470ed3d7567e81fdb7a6d Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Tue, 3 May 2022 10:51:55 +0000
+Subject: PATCH Disable various compiler configs
+
+---
+ build/config/compiler/BUILD.gn | 114 +++++----------------------------
+ 1 file changed, 17 insertions(+), 97 deletions(-)
+
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index f378b95..cb2aeb3 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -286,9 +286,7 @@ config("compiler") {
+ 
+   configs += 
+     # See the definitions below.
+-    ":clang_revision",
+     ":rustc_revision",
+-    ":compiler_cpu_abi",
+     ":compiler_codegen",
+     ":compiler_deterministic",
+   
+@@ -522,31 +520,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" 
+@@ -1231,45 +1204,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.
+@@ -1534,15 +1468,6 @@ config("default_warnings") {
+         cflags +=  "-Wno-unqualified-std-cast-call" 
+       }
+ 
+-      if (!is_nacl && !(is_chromeos ||
+-                        default_toolchain == "//build/toolchain/cros:target")) {
+-        # TODO(https://crbug.com/1316298): Re-enable once test failure is figured out
+-        cflags += 
+-          "-Xclang",
+-          "-no-opaque-pointers",
+-        
+-      }
+-
+       if (is_fuchsia) {
+         # TODO(https://bugs.chromium.org/p/fuchsia/issues/detail?id=77383)
+         cflags +=  "-Wno-deprecated-copy" 
+@@ -1611,7 +1536,7 @@ config("chromium_code") {
+       defines =  "_HAS_NODISCARD" 
+     }
+   } else {
+-    cflags =  "-Wall" 
++    cflags = 
+     if (treat_warnings_as_errors) {
+       cflags +=  "-Werror" 
+ 
+@@ -1620,10 +1545,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.
+@@ -1632,15 +1553,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" 
+@@ -2031,7 +1943,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.
+@@ -2069,7 +1982,8 @@ config("optimize") {
+ }
+ 
+ # Turn off optimizations.
+-config("no_optimize") {
++config("no_optimize") { }
++config("xno_optimize") {
+   if (is_win) {
+     cflags = 
+       "/Od",  # Disable optimization.
+@@ -2109,7 +2023,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:
+@@ -2142,7 +2057,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:
+@@ -2168,7 +2084,8 @@ config("optimize_speed") {
+   }
+ }
+ 
+-config("optimize_fuzzing") {
++config("optimize_fuzzing") { }

chromium-80-QuicStreamSendBuffer-deleted-move-constructor.patch Deleted

@@ -1,30 +0,0 @@
-From 00f47df999c9b19e80fdc01db0ae9ca1b6a12b3a Mon Sep 17 00:00:00 2001
-From: vasilvv <vasilvv@google.com>
-Date: Wed, 03 Apr 2019 13:58:53 -0700
-Subject: PATCH GCC: do not delete move constructor of QuicStreamSendBuffer
-
-QuicStreamSendBuffer constructor is implicitely required in the
-initialization of the vector of substreams in QuicCryptoStream.
-Though clang apparently ignores that, GCC fails to build.
-
-BUG=chromium:819294
-
-Originally submitted by José Dapena Paz <jose.dapena@lge.com> at https://quiche-review.googlesource.com/c/quiche/+/2420
-
-PiperOrigin-RevId: 241800134
-Change-Id: I4e3c97d6e5895d85340e8c1b740e6196d9104066
----
-
-diff --git a/net/third_party/quiche/src/quic/core/quic_stream_send_buffer.h b/net/third_party/quiche/src/quic/core/quic_stream_send_buffer.h
-index e34514b..74e9d0d 100644
---- a/net/third_party/quiche/src/quic/core/quic_stream_send_buffer.h
-+++ b/net/third_party/quiche/src/quic/core/quic_stream_send_buffer.h
-@@ -62,7 +62,7 @@
-  public:
-   explicit QuicStreamSendBuffer(QuicBufferAllocator* allocator);
-   QuicStreamSendBuffer(const QuicStreamSendBuffer& other) = delete;
--  QuicStreamSendBuffer(QuicStreamSendBuffer&& other) = delete;
-+  QuicStreamSendBuffer(QuicStreamSendBuffer&& other) = default;
-   ~QuicStreamSendBuffer();
- 
-   // Save |data_length| of data starts at |iov_offset| in |iov| to send buffer.

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

@@ -1,238 +0,0 @@
-From 80368f8ba7a8bab13440463a254888311efe3986 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Tue, 4 May 2021 15:00:19 +0000
-Subject: PATCH sql: make VirtualCursor standard layout type
-
-sql::recover::VirtualCursor needs to be a standard layout type, but
-has members of type std::unique_ptr. However, std::unique_ptr is not
-guaranteed to be standard layout. Compiling with clang combined with
-gcc-11 libstdc++ fails because of this. Replace std::unique_ptr with
-raw pointers.
-
-Bug: 1189788
-Change-Id: Ia6dc388cc5ef1c0f2afc75f8ca45b9f12687ca9c
----
- sql/recover_module/btree.cc  | 21 +++++++++++++++------
- sql/recover_module/btree.h   | 17 +++++++++++++----
- sql/recover_module/cursor.cc | 24 ++++++++++++------------
- sql/recover_module/cursor.h  |  2 +-
- sql/recover_module/pager.cc  |  7 +++----
- sql/recover_module/pager.h   |  5 +++--
- 6 files changed, 47 insertions(+), 29 deletions(-)
-
-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()
- 
--LeafPageDecoder::LeafPageDecoder(DatabasePageReader* db_reader) noexcept
--    : page_id_(db_reader->page_id()),
--      db_reader_(db_reader),
--      cell_count_(ComputeCellCount(db_reader)),
--      next_read_index_(0),
--      last_record_size_(0) {
-+void LeafPageDecoder::Initialize(DatabasePageReader* db_reader) {
-+  DCHECK(db_reader);
-   DCHECK(IsOnValidPage(db_reader));
-+  page_id_ = db_reader->page_id();
-+  db_reader_ = db_reader;
-+  cell_count_ = ComputeCellCount(db_reader);
-+  next_read_index_ = 0;
-+  last_record_size_ = 0;
-   DCHECK(DatabasePageReader::IsValidPageId(page_id_));
- }
- 
-+void LeafPageDecoder::Reset() {
-+  db_reader_ = nullptr;
-+  page_id_ = 0;
-+  cell_count_ = 0;
-+  next_read_index_ = 0;
-+  last_record_size_ = 0;
-+}
-+
- bool LeafPageDecoder::TryAdvance() {
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-   DCHECK(CanAdvance());
-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.
--  explicit LeafPageDecoder(DatabasePageReader* db_reader) noexcept;
-+  explicit LeafPageDecoder() noexcept = default;
-   ~LeafPageDecoder() noexcept = default;
- 
-   LeafPageDecoder(const LeafPageDecoder&) = delete;
-@@ -151,6 +151,15 @@ class LeafPageDecoder {
-   // read as long as CanAdvance() returns true.
-   bool TryAdvance();
- 
-+  // Initialize with DatabasePageReader
-+  void Initialize(DatabasePageReader* db_reader);
-+
-+  // Reset internal DatabasePageReader
-+  void Reset();
-+
-+  // True if DatabasePageReader is valid
-+  bool IsValid() { return (db_reader_ != nullptr); }
-+
-   // True if the given reader may point to an inner page in a table B-tree.
-   //
-   // The last ReadPage() call on |db_reader| must have succeeded.
-@@ -164,14 +173,14 @@ class LeafPageDecoder {
-   static int ComputeCellCount(DatabasePageReader* db_reader);
- 
-   // The number of the B-tree page this reader is reading.
--  const int64_t page_id_;
-+  int64_t page_id_;
-   // Used to read the tree page.
-   //
-   // Raw pointer usage is acceptable because this instance's owner is expected
-   // to ensure that the DatabasePageReader outlives this.
--  DatabasePageReader* const db_reader_;
-+  DatabasePageReader* db_reader_;
-   // Caches the ComputeCellCount() value for this reader's page.
--  const int cell_count_ = ComputeCellCount(db_reader_);
-+  int cell_count_;
- 
-   // The reader's cursor state.
-   //
-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();
--  leaf_decoder_ = nullptr;
-+  leaf_decoder_.Reset();
- 
-   AppendPageDecoder(table_->root_page_id());
-   return Next();
-@@ -38,18 +38,18 @@ int VirtualCursor::Next() {
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-   record_reader_.Reset();
- 
--  while (!inner_decoders_.empty() || leaf_decoder_.get()) {
--    if (leaf_decoder_.get()) {
--      if (!leaf_decoder_->CanAdvance()) {
-+  while (!inner_decoders_.empty() || leaf_decoder_.IsValid()) {
-+    if (leaf_decoder_.IsValid()) {
-+      if (!leaf_decoder_.CanAdvance()) {
-         // The leaf has been exhausted. Remove it from the DFS stack.
--        leaf_decoder_ = nullptr;
-+        leaf_decoder_.Reset();
-         continue;
-       }
--      if (!leaf_decoder_->TryAdvance())
-+      if (!leaf_decoder_.TryAdvance())
-         continue;
- 
--      if (!payload_reader_.Initialize(leaf_decoder_->last_record_size(),
--                                      leaf_decoder_->last_record_offset())) {
-+      if (!payload_reader_.Initialize(leaf_decoder_.last_record_size(),
-+                                      leaf_decoder_.last_record_offset())) {
-         continue;
-       }
-       if (!record_reader_.Initialize())
-@@ -101,13 +101,13 @@ int VirtualCursor::ReadColumn(int column
- int64_t VirtualCursor::RowId() {
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-   DCHECK(record_reader_.IsInitialized());
--  DCHECK(leaf_decoder_.get());
--  return leaf_decoder_->last_record_rowid();
-+  DCHECK(leaf_decoder_.IsValid());
-+  return leaf_decoder_.last_record_rowid();
- }
- 
- void VirtualCursor::AppendPageDecoder(int page_id) {
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
--  DCHECK(leaf_decoder_.get() == nullptr)
-+  DCHECK(!leaf_decoder_.IsValid())
-       << __func__
-       << " must only be called when the current path has no leaf decoder";
- 
-@@ -115,7 +115,7 @@ void VirtualCursor::AppendPageDecoder(in
-     return;
- 
-   if (LeafPageDecoder::IsOnValidPage(&db_reader_)) {
--    leaf_decoder_ = std::make_unique<LeafPageDecoder>(&db_reader_);
-+    leaf_decoder_.Initialize(&db_reader_);
-     return;
-   }
- 
-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.
--  std::unique_ptr<LeafPageDecoder> leaf_decoder_;
-+  LeafPageDecoder leaf_decoder_;
- 
-   SEQUENCE_CHECKER(sequence_checker_);
- };
-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)
--    : page_data_(std::make_unique<uint8_t>(table->page_size())),
--      table_(table) {
-+    : page_data_(), table_(table) {
-   DCHECK(table != nullptr);
-   DCHECK(IsValidPageSize(table->page_size()));
- }
-@@ -57,8 +56,8 @@ int DatabasePageReader::ReadPage(int pag
-                     std::numeric_limits<int64_t>::max(),

chromium-95-quiche-include.patch Deleted

chromium-97-ScrollView-reference.patch Deleted

@@ -1,23 +0,0 @@
-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 Deleted

@@ -1,26 +0,0 @@
-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-clang-nomerge.patch Changed

chromium-fix-swiftshader-template.patch Deleted

@@ -1,70 +0,0 @@
-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-missing-include-tuple.patch Deleted

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

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

ffmpeg-new-channel-layout.patch Added

@@ -0,0 +1,333 @@
+From 6e554a30893150793c2638e3689cf208ffc8e375 Mon Sep 17 00:00:00 2001
+From: Dale Curtis <dalecurtis@chromium.org>
+Date: Sat, 2 Apr 2022 05:13:53 +0000
+Subject: PATCH Roll src/third_party/ffmpeg/ 574c39cce..32b2d1d526 (1125
+ commits)
+
+https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/574c39cce323..32b2d1d526
+
+Created with:
+  roll-dep src/third_party/ffmpeg
+
+Fixed: 1293918
+Cq-Include-Trybots: luci.chromium.try:mac_chromium_asan_rel_ng,linux_chromium_asan_rel_ng,linux_chromium_chromeos_asan_rel_ng
+Change-Id: I41945d0f963e3d1f65940067bac22f63b68e37d2
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3565647
+Auto-Submit: Dale Curtis <dalecurtis@chromium.org>
+Reviewed-by: Dan Sanders <sandersd@chromium.org>
+Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#988253}
+---
+ .../clear_key_cdm/ffmpeg_cdm_audio_decoder.cc | 29 ++++++++++---------
+ media/ffmpeg/ffmpeg_common.cc                 | 11 +++----
+ media/filters/audio_file_reader.cc            |  9 +++---
+ media/filters/audio_file_reader_unittest.cc   |  6 ++--
+ .../filters/audio_video_metadata_extractor.cc | 11 +++++--
+ .../filters/ffmpeg_aac_bitstream_converter.cc |  7 +++--
+ ...ffmpeg_aac_bitstream_converter_unittest.cc |  2 +-
+ media/filters/ffmpeg_audio_decoder.cc         | 13 +++++----
+ 8 files changed, 51 insertions(+), 37 deletions(-)
+
+diff --git a/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc b/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc
+index e4fc3f460e2..9b1ad9f7675 100644
+--- a/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc
++++ b/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc
+@@ -74,7 +74,7 @@ void CdmAudioDecoderConfigToAVCodecContext(
+       codec_context->sample_fmt = AV_SAMPLE_FMT_NONE;
+   }
+ 
+-  codec_context->channels = config.channel_count;
++  codec_context->ch_layout.nb_channels = config.channel_count;
+   codec_context->sample_rate = config.samples_per_second;
+ 
+   if (config.extra_data) {
+@@ -124,8 +124,8 @@ void CopySamples(cdm::AudioFormat cdm_format,
+     case cdm::kAudioFormatPlanarS16:
+     case cdm::kAudioFormatPlanarF32: {
+       const int decoded_size_per_channel =
+-          decoded_audio_size / av_frame.channels;
+-      for (int i = 0; i < av_frame.channels; ++i) {
++          decoded_audio_size / av_frame.ch_layout.nb_channels;
++      for (int i = 0; i < av_frame.ch_layout.nb_channels; ++i) {
+         memcpy(output_buffer, av_frame.extended_datai,
+                decoded_size_per_channel);
+         output_buffer += decoded_size_per_channel;
+@@ -185,13 +185,14 @@ bool FFmpegCdmAudioDecoder::Initialize(
+   // Success!
+   decoding_loop_ = std::make_unique<FFmpegDecodingLoop>(codec_context_.get());
+   samples_per_second_ = config.samples_per_second;
+-  bytes_per_frame_ = codec_context_->channels * config.bits_per_channel / 8;
++  bytes_per_frame_ =
++      codec_context_->ch_layout.nb_channels * config.bits_per_channel / 8;
+   output_timestamp_helper_ =
+       std::make_unique<AudioTimestampHelper>(config.samples_per_second);
+   is_initialized_ = true;
+ 
+   // Store initial values to guard against midstream configuration changes.
+-  channels_ = codec_context_->channels;
++  channels_ = codec_context_->ch_layout.nb_channels;
+   av_sample_format_ = codec_context_->sample_fmt;
+ 
+   return true;
+@@ -291,17 +292,19 @@ cdm::Status FFmpegCdmAudioDecoder::DecodeBuffer(
+   for (auto& frame : audio_frames) {
+     int decoded_audio_size = 0;
+     if (frame->sample_rate != samples_per_second_ ||
+-        frame->channels != channels_ || frame->format != av_sample_format_) {
++        frame->ch_layout.nb_channels != channels_ ||
++        frame->format != av_sample_format_) {
+       DLOG(ERROR) << "Unsupported midstream configuration change!"
+                   << " Sample Rate: " << frame->sample_rate << " vs "
+-                  << samples_per_second_ << ", Channels: " << frame->channels
+-                  << " vs " << channels_ << ", Sample Format: " << frame->format
+-                  << " vs " << av_sample_format_;
++                  << samples_per_second_
++                  << ", Channels: " << frame->ch_layout.nb_channels << " vs "
++                  << channels_ << ", Sample Format: " << frame->format << " vs "
++                  << av_sample_format_;
+       return cdm::kDecodeError;
+     }
+ 
+     decoded_audio_size = av_samples_get_buffer_size(
+-        nullptr, codec_context_->channels, frame->nb_samples,
++        nullptr, codec_context_->ch_layout.nb_channels, frame->nb_samples,
+         codec_context_->sample_fmt, 1);
+     if (!decoded_audio_size)
+       continue;
+@@ -320,9 +323,9 @@ bool FFmpegCdmAudioDecoder::OnNewFrame(
+     size_t* total_size,
+     std::vector<std::unique_ptr<AVFrame, ScopedPtrAVFreeFrame>>* audio_frames,
+     AVFrame* frame) {
+-  *total_size += av_samples_get_buffer_size(nullptr, codec_context_->channels,
+-                                            frame->nb_samples,
+-                                            codec_context_->sample_fmt, 1);
++  *total_size += av_samples_get_buffer_size(
++      nullptr, codec_context_->ch_layout.nb_channels, frame->nb_samples,
++      codec_context_->sample_fmt, 1);
+   audio_frames->emplace_back(av_frame_clone(frame));
+   return true;
+ }
+diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc
+index 87ca8969626..76f03d6608e 100644
+--- a/media/ffmpeg/ffmpeg_common.cc
++++ b/media/ffmpeg/ffmpeg_common.cc
+@@ -345,10 +345,11 @@ bool AVCodecContextToAudioDecoderConfig(const AVCodecContext* codec_context,
+       codec_context->sample_fmt, codec_context->codec_id);
+ 
+   ChannelLayout channel_layout =
+-      codec_context->channels > 8
++      codec_context->ch_layout.nb_channels > 8
+           ? CHANNEL_LAYOUT_DISCRETE
+-          : ChannelLayoutToChromeChannelLayout(codec_context->channel_layout,
+-                                               codec_context->channels);
++          : ChannelLayoutToChromeChannelLayout(
++                codec_context->ch_layout.u.mask,
++                codec_context->ch_layout.nb_channels);
+ 
+   int sample_rate = codec_context->sample_rate;
+   switch (codec) {
+@@ -401,7 +402,7 @@ bool AVCodecContextToAudioDecoderConfig(const AVCodecContext* codec_context,
+                      extra_data, encryption_scheme, seek_preroll,
+                      codec_context->delay);
+   if (channel_layout == CHANNEL_LAYOUT_DISCRETE)
+-    config->SetChannelsForDiscrete(codec_context->channels);
++    config->SetChannelsForDiscrete(codec_context->ch_layout.nb_channels);
+ 
+ #if BUILDFLAG(ENABLE_PLATFORM_AC3_EAC3_AUDIO)
+   // These are bitstream formats unknown to ffmpeg, so they don't have
+@@ -470,7 +471,7 @@ void AudioDecoderConfigToAVCodecContext(const AudioDecoderConfig& config,
+ 
+   // TODO(scherkus): should we set |channel_layout|? I'm not sure if FFmpeg uses
+   // said information to decode.
+-  codec_context->channels = config.channels();
++  codec_context->ch_layout.nb_channels = config.channels();
+   codec_context->sample_rate = config.samples_per_second();
+ 
+   if (config.extra_data().empty()) {
+diff --git a/media/filters/audio_file_reader.cc b/media/filters/audio_file_reader.cc
+index 5f257bdfaa6..e1be5aa9a5b 100644
+--- a/media/filters/audio_file_reader.cc
++++ b/media/filters/audio_file_reader.cc
+@@ -113,14 +113,15 @@ bool AudioFileReader::OpenDecoder() {
+ 
+   // Verify the channel layout is supported by Chrome.  Acts as a sanity check
+   // against invalid files.  See http://crbug.com/171962
+-  if (ChannelLayoutToChromeChannelLayout(codec_context_->channel_layout,
+-                                         codec_context_->channels) ==
++  if (ChannelLayoutToChromeChannelLayout(
++          codec_context_->ch_layout.u.mask,
++          codec_context_->ch_layout.nb_channels) ==
+       CHANNEL_LAYOUT_UNSUPPORTED) {
+     return false;
+   }
+ 
+   // Store initial values to guard against midstream configuration changes.
+-  channels_ = codec_context_->channels;
++  channels_ = codec_context_->ch_layout.nb_channels;
+   audio_codec_ = CodecIDToAudioCodec(codec_context_->codec_id);
+   sample_rate_ = codec_context_->sample_rate;
+   av_sample_format_ = codec_context_->sample_fmt;
+@@ -223,7 +224,7 @@ bool AudioFileReader::OnNewFrame(
+   if (frames_read < 0)
+     return false;
+ 
+-  const int channels = frame->channels;
++  const int channels = frame->ch_layout.nb_channels;
+   if (frame->sample_rate != sample_rate_ || channels != channels_ ||
+       frame->format != av_sample_format_) {
+     DLOG(ERROR) << "Unsupported midstream configuration change!"
+diff --git a/media/filters/audio_file_reader_unittest.cc b/media/filters/audio_file_reader_unittest.cc
+index 2aba7927a31..1f45a50cace 100644
+--- a/media/filters/audio_file_reader_unittest.cc
++++ b/media/filters/audio_file_reader_unittest.cc
+@@ -121,11 +121,11 @@ class AudioFileReaderTest : public testing::Test {
+     EXPECT_FALSE(reader_->Open());
+   }
+ 
+-  void RunTestFailingDecode(const char* fn) {
++  void RunTestFailingDecode(const char* fn, int expect_read = 0) {
+     Initialize(fn);
+     EXPECT_TRUE(reader_->Open());
+     std::vector<std::unique_ptr<AudioBus>> decoded_audio_packets;
+-    EXPECT_EQ(reader_->Read(&decoded_audio_packets), 0);
++    EXPECT_EQ(reader_->Read(&decoded_audio_packets), expect_read);
+   }
+ 
+   void RunTestPartialDecode(const char* fn) {
+@@ -219,7 +219,7 @@ TEST_F(AudioFileReaderTest, AAC_ADTS) {
+ }
+

gcc-enable-lto.patch Changed

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

chromium-symbolic.svg Changed

@@ -1,8 +1,545 @@
-<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
- <g transform="translate(0 -292.77)" fill-rule="evenodd">
-  <path transform="translate(0 292.77)" d="m8 0c-2.9688 0-5.5431 1.6049-6.9238 3.9941l3.4629 5.998 0.0058594-0.0039063c-0.33743-0.587-0.54492-1.2599-0.54492-1.9883 0-2.216 1.784-4 4-4h6.918l0.007812-0.0039062c-1.3803-2.3906-3.956-3.9961-6.9258-3.9961zm-6.9238 3.9941c-0.16618 0.28757-0.31369 0.58593-0.44336 0.89453 0.12852-0.30638 0.27614-0.60523 0.44336-0.89453zm-0.81445 2.002c-0.063348 0.24696-0.11637 0.49818-0.15625 0.75391 0.040321-0.25396 0.09178-0.50523 0.15625-0.75391zm-0.19336 1.002c-0.031547 0.25414-0.049317 0.51231-0.056641 0.77344 0.0074787-0.25874 0.024224-0.51758 0.056641-0.77344zm-0.066406 0.96289c-6.3137e-5 0.013175-0.0019531 0.025872-0.0019531 0.039062 0 0.31231 0.022151 0.61909 0.056641 0.92188-0.037536-0.3208-0.05629-0.64074-0.054688-0.96094zm0.076172 1.1016c0.038415 0.29125 0.093448 0.5771 0.16211 0.85742-0.070883-0.28406-0.12335-0.57082-0.16211-0.85742zm0.19727 0.99805c0.091086 0.3385 0.20625 0.67364 0.34375 1.0039-0.13429-0.32476-0.25247-0.65856-0.34375-1.0039zm0.34375 1.0039c0.093646 0.22647 0.20902 0.4391 0.32227 0.6543-0.11418-0.21652-0.22997-0.43262-0.32227-0.6543zm0.32227 0.6543c0.047723 0.090496 0.083121 0.18399 0.13477 0.27344 0.0068955 0.011943 0.016491 0.021308 0.023438 0.033203-0.057828-0.099177-0.10459-0.20477-0.1582-0.30664zm0.1582 0.30664c0.18369 0.31503 0.38946 0.61488 0.61328 0.90039-0.22081-0.2833-0.42705-0.5815-0.61328-0.90039zm0.67383 0.98828c0.24745 0.30711 0.51472 0.59779 0.80469 0.86523-0.286-0.26475-0.5556-0.55416-0.80469-0.86523zm1.4141 1.373c0.19915 0.15005 0.40407 0.29066 0.61719 0.42188-0.21156-0.1305-0.41738-0.27099-0.61719-0.42188zm0.64844 0.44141c0.20201 0.12309 0.40966 0.23664 0.62305 0.3418-0.21134-0.10449-0.42088-0.21838-0.62305-0.3418zm0.71484 0.38672c0.19014 0.090687 0.38386 0.17422 0.58203 0.25-0.1972-0.075792-0.39101-0.15859-0.58203-0.25zm0.74609 0.30859c0.18385 0.065711 0.36872 0.12728 0.55859 0.17969-0.18849-0.052523-0.37433-0.11344-0.55859-0.17969zm0.75586 0.23047c0.17137 0.042615 0.34392 0.081857 0.51953 0.11328-0.1743-0.031708-0.34783-0.070112-0.51953-0.11328zm0.84375 0.16211c0.14048 0.019266 0.28107 0.038852 0.42383 0.050781-0.1422-0.012166-0.28272-0.031057-0.42383-0.050781zm0.85156 0.072265c0.084408 0.00261 0.16689 0.011719 0.25195 0.011719v-0.007812c-0.084073-4e-6 -0.16806-0.001251-0.25195-0.003907z"/>
-  <path transform="translate(0 292.77)" d="m8.2051-0.0039062c-0.067876-0.0018334-0.13533 0.0040042-0.20312 0.0039062 0.36876 8.8644e-5 0.73088 0.02619 1.0859 0.074219-0.29424-0.041037-0.58844-0.070174-0.88281-0.078125zm-0.21289 0.0039062c-0.26615-5.8021e-5 -0.53129 0.014666-0.79492 0.041016 0.26143-0.025824 0.52654-0.040759 0.79492-0.041016zm-0.85156 0.046875c-0.23605 0.025293-0.47073 0.061354-0.70312 0.10742 0.23076-0.045338 0.46557-0.082259 0.70312-0.10742zm1.9727 0.03125c0.29658 0.042337 0.59114 0.10493 0.88477 0.18164-0.28938-0.074218-0.58339-0.13988-0.88477-0.18164zm-2.8145 0.10547c-0.20793 0.045059-0.41353 0.096739-0.61719 0.1582 0.20238-0.060783 0.4083-0.11329 0.61719-0.1582zm4.0117 0.16406c0.17588 0.052879 0.34712 0.11527 0.51758 0.17969-0.17171-0.065602-0.3437-0.12659-0.51758-0.17969zm-4.7949 0.048828c-0.18254 0.059478-0.363 0.12276-0.54102 0.19531 0.17733-0.072143 0.35752-0.13576 0.54102-0.19531zm-0.75195 0.28711c-0.16297 0.071956-0.32421 0.14754-0.48242 0.23047 0.15724-0.082363 0.31917-0.15847 0.48242-0.23047zm6.4824 0.0078125c0.11114 0.049754 0.22028 0.11078 0.33008 0.16602-0.11024-0.055265-0.21697-0.11578-0.33008-0.16602zm-7.1875 0.3457c-0.15224 0.086105-0.30238 0.17512-0.44922 0.27148 0.14627-0.09592 0.29643-0.18512 0.44922-0.27148zm8.332 0.29102c0.12847 0.084776 0.25775 0.1679 0.38086 0.25977-0.12261-0.090957-0.2518-0.17494-0.38086-0.25977zm-8.9746 0.11328c-0.14122 0.098764-0.2788 0.20216-0.41406 0.31055 0.13477-0.10781 0.27232-0.21151 0.41406-0.31055zm9.6836 0.4082c0.14161 0.11775 0.281 0.2381 0.41406 0.36523-0.13289-0.12624-0.27123-0.24721-0.41406-0.36523zm-10.328 0.095703c-0.10925 0.094548-0.21767 0.18998-0.32227 0.29102 0.10418-0.10034 0.21274-0.19643 0.32227-0.29102zm11.002 0.52539c0.18123 0.18967 0.35359 0.38691 0.51562 0.59375-0.16146-0.20541-0.33262-0.40324-0.51562-0.59375zm-11.592 0.039062c-0.087652 0.093206-0.17413 0.18711-0.25781 0.28516 0.083362-0.097301 0.16992-0.19202 0.25781-0.28516zm-0.5332 0.62891c-0.066279 0.086893-0.13213 0.17344-0.19531 0.26367 0.062985-0.089711 0.12878-0.17674 0.19531-0.26367zm12.717 0.015625c0.19435 0.25492 0.36841 0.52294 0.5293 0.79688-0.16178-0.27581-0.3368-0.54357-0.5293-0.79688zm-13.176 0.6543c-0.040114 0.065194-0.086473 0.12468-0.125 0.19141l0.0058594 0.0039062c0.038163-0.06626 0.07915-0.13028 0.11914-0.19531zm6.8105 0.19141c2.216 0 4 1.784 4 4 0 0.73147-0.2087 1.4074-0.54883 1.9961l0.005859 0.0039062-0.13867 0.24023-3.3184 5.75v0.009766c2.7599-0.001023 5.4372-1.4285 6.9219-4 1.4856-2.5731 1.3819-5.6088 0-8h-6.9219z" opacity=".55"/>
-  <path transform="translate(0 292.77)" d="m7.9922 0c-0.26839 2e-4 -0.53349 0.015216-0.79492 0.041016 0.26363-0.0263 0.52877-0.041076 0.79492-0.041016zm-0.85156 0.046875c-0.23755 0.02512-0.47236 0.062122-0.70312 0.10742 0.2324-0.04602 0.46708-0.082122 0.70312-0.10742zm-0.8418 0.13672c-0.20888 0.04491-0.41481 0.097403-0.61719 0.1582 0.20366-0.0615 0.40926-0.1131 0.61719-0.1582zm4.0117 0.16406c0.17388 0.0531 0.34587 0.11409 0.51758 0.17969-0.17045-0.06442-0.3417-0.12679-0.51758-0.17969zm-4.7949 0.048828c-0.18349 0.05955-0.36369 0.12321-0.54102 0.19531 0.17802-0.07256 0.35848-0.13581 0.54102-0.19531zm-0.75195 0.28711c-0.16325 0.07199-0.32518 0.14807-0.48242 0.23047 0.15821-0.08294 0.31945-0.15847 0.48242-0.23047zm-0.70508 0.35352c-0.15279 0.08637-0.30295 0.17558-0.44922 0.27148 0.14684-0.09637 0.29698-0.18538 0.44922-0.27148zm8.332 0.29102c0.12906 0.08482 0.25825 0.16877 0.38086 0.25977-0.12311-0.09186-0.25239-0.17497-0.38086-0.25977zm-8.9746 0.11328c-0.14174 0.09904-0.2793 0.20274-0.41406 0.31055 0.13527-0.10839 0.27284-0.21175 0.41406-0.31055zm9.6836 0.4082c0.14284 0.11803 0.28117 0.23899 0.41406 0.36523-0.13307-0.12714-0.27246-0.24748-0.41406-0.36523zm-10.328 0.095703c-0.10952 0.09459-0.21808 0.19069-0.32227 0.29102 0.1046-0.10103 0.21302-0.19652 0.32227-0.29102zm11.002 0.52539c0.18301 0.1905 0.35417 0.38834 0.51562 0.59375-0.16203-0.20684-0.3344-0.40409-0.51562-0.59375zm-11.592 0.039062c-0.08789 0.09314-0.17445 0.18786-0.25781 0.28516 0.083679-0.09804 0.17016-0.19196 0.25781-0.28516zm-0.5332 0.62891c-0.066533 0.08694-0.13233 0.17397-0.19531 0.26367 0.063183-0.09023 0.12903-0.17677 0.19531-0.26367zm13.283 0.85352-0.013672 0.0078125h0.003906c1.0361 1.7929 1.3524 3.9472 0.82031 5.998 0.51081-1.9573 0.28609-4.1064-0.81055-6.0059zm-13.855 0.0019531c-0.0019132 0.0032892-0.0039597 0.0064654-0.0058594 0.0097656-1.3768 2.3898-1.4778 5.4185 0.0058594 7.9883 1.4849 2.572 4.1633 3.9999 6.9238 4v-0.001954l3.3184-5.75c-0.71742 1.0637-1.9334 1.7598-3.3184 1.7598-1.4877 0-2.7659-0.81274-3.4551-2.0117l-0.0058594 0.0039063-3.4629-5.998zm10.242 6.2461 0.13867-0.24023-0.005859-0.0039062c-0.046283 0.080108-0.081254 0.1677-0.13281 0.24414zm4.4238-0.23828c-0.17464 0.67175-0.44309 1.3319-0.80469 1.9648 0.3561-0.6189 0.62541-1.2792 0.80469-1.9648zm-0.80469 1.9648c-0.008878 0.01543-0.016406 0.031498-0.025391 0.046875 0.002853-0.004915 0.006923-0.008748 0.009766-0.013672 0.006215-0.010765 0.009465-0.022422 0.015625-0.033203zm-0.025391 0.046875c-0.16138 0.27807-0.34026 0.53954-0.5293 0.78906 0.19208-0.25377 0.37016-0.51671 0.5293-0.78906zm-0.5293 0.78906c-0.034882 0.046087-0.07147 0.09131-0.10742 0.13672 0.036023-0.045459 0.072258-0.090304 0.10742-0.13672zm-0.10742 0.13672c-0.19263 0.24309-0.39299 0.47669-0.60742 0.69336 0.21926-0.21926 0.4175-0.45347 0.60742-0.69336zm-0.75977 0.84375c-0.16802 0.16083-0.34574 0.30905-0.52539 0.45312 0.18255-0.14513 0.35845-0.29493 0.52539-0.45312zm-0.79492 0.66992c-0.19636 0.14387-0.40011 0.27399-0.60742 0.39844 0.20953-0.12546 0.41362-0.25756 0.60742-0.39844zm-1.1328 0.68164c-0.13759 0.069106-0.27496 0.1383-0.41602 0.19922 0.14014-0.060811 0.27798-0.12975 0.41602-0.19922zm-0.8125 0.35547c-0.17664 0.065328-0.35449 0.127-0.53516 0.17969 0.17969-0.052782 0.3577-0.11362 0.53516-0.17969zm-0.86914 0.27148c-0.23843 0.058475-0.47953 0.1042-0.72266 0.14062 0.2417-0.036415 0.48287-0.081371 0.72266-0.14062zm-0.90625 0.17383c-0.30489 0.038433-0.61309 0.055452-0.92188 0.058594 0.30718-0.003008 0.61446-0.019611 0.92188-0.058594z" opacity=".7"/>
-  <rect x="5" y="297.77" width="6" height="6" ry="3" opacity=".85"/>
- </g>
-</svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg2"
+   xml:space="preserve"
+   width="1056"
+   height="816"
+   viewBox="0 0 1056 816"
+   sodipodi:docname="chromium.ai"><metadata
+     id="metadata8"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs6"><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath18"><path
+         d="m 332.315,306.427 c 0,-35.346 28.656,-64.001 64,-64.001 v 0 c 35.348,0 64.001,28.655 64.001,64.001 v 0 c 0,35.348 -28.653,64.003 -64.001,64.003 v 0 c -35.344,0 -64,-28.655 -64,-64.003"
+         id="path16" /></clipPath><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath26"><path
+         d="m 356.24,344.208 h 80.16 v -80.16 h -80.16 z"
+         id="path24" /></clipPath><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath30"><path
+         d="m 356.24,344.208 h 80.16 v -80.16 h -80.16 z"
+         id="path28" /></clipPath><mask
+       maskUnits="userSpaceOnUse"
+       x="0"
+       y="0"
+       width="1"
+       height="1"
+       id="mask32"><g
+         id="g42"><g
+           clip-path="url(#clipPath30)"
+           id="g40"><g
+             id="g38"><g
+               transform="matrix(80.160004,0,0,80.160004,356.24023,264.048)"
+               id="g36"><image
+                 width="1"
+                 height="1"
+                 style="image-rendering:optimizeSpeed"
+                 preserveAspectRatio="none"
+                 transform="matrix(1,0,0,-1,0,1)"