uppkg -> 99.0.4844.5§

.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = ungoogled-chromium-xdg
 	pkgdesc = A lightweight approach to removing Google web service dependency - without creating a useless ~/.pki directory
-	pkgver = 97.0.4692.99
+	pkgver = 99.0.4844.51
 	pkgrel = 1
 	url = https://github.com/Eloston/ungoogled-chromium
 	arch = x86_64
@@ -51,32 +51,32 @@ pkgbase = ungoogled-chromium-xdg
 	provides = chromium
 	conflicts = chromium
 	options = !lto
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-97.0.4692.99.tar.xz
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-99.0.4844.51.tar.xz
 	source = https://github.com/foutrelis/chromium-launcher/archive/v8/chromium-launcher-8.tar.gz
-	source = https://github.com/stha09/chromium-patches/releases/download/chromium-97-patchset-4/chromium-97-patchset-4.tar.xz
-	source = wayland-fix-binding-to-wrong-version.patch
+	source = https://github.com/stha09/chromium-patches/releases/download/chromium-99-patchset-3/chromium-99-patchset-3.tar.xz
+	source = fix-build-break-with-system-libdrm.patch
+	source = sandbox-build-if-glibc-2.34-dynamic-stack-size-is-en.patch
+	source = webcodecs-stop-using-AudioOpusEncoder.patch
+	source = use-FT_Done_MM_Var-in-CFX_Font-AdjustMMParams.patch
 	source = sql-make-VirtualCursor-standard-layout-type.patch
-	source = chromium-93-ffmpeg-4.4.patch
-	source = unbundle-ffmpeg-av_stream_get_first_dts.patch
-	source = unexpire-accelerated-video-decode-flag.patch
 	source = use-oauth2-client-switches-as-default.patch
 	source = xdg-basedir.patch
 	source = no-omnibox-suggestion-autocomplete.patch
-	source = ungoogled-chromium-xdg-97.0.4692.99-1.tar.gz::https://github.com/Eloston/ungoogled-chromium/archive/97.0.4692.99-1.tar.gz
+	source = ungoogled-chromium-xdg-99.0.4844.51-1.tar.gz::https://github.com/Eloston/ungoogled-chromium/archive/99.0.4844.51-1.tar.gz
 	source = chromium-drirc-disable-10bpc-color-configs.conf
 	source = wayland-egl.patch
-	sha256sums = c91bae205705b367f2cfc1f72ce1ee99b2ceb5edfc584e15c60a6ab5ff01ecba
+	sha256sums = 97c52e57eca0dc8b752d274047f38c88aaa86036c0587b26b056efbd3fb2bae3
 	sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a
-	sha256sums = 7af5c0a55a20c0fb496b2f4448d89203a83bb1914754d864460e55e68731ef0b
-	sha256sums = 29541840921302060f712838ba460cd7e988148af3ce3c9dc45437fc78442a67
-	sha256sums = dd317f85e5abfdcfc89c6f23f4c8edbcdebdd5e083dcec770e5da49ee647d150
-	sha256sums = 1a9e074f417f8ffd78bcd6874d8e2e74a239905bf662f76a7755fa40dc476b57
-	sha256sums = 1f0c1a7a1eb67d91765c9f28df815f58e1c6dc7b37d0acd4d68cac8e5515786c
-	sha256sums = 2a97b26c3d6821b15ef4ef1369905c6fa3e9c8da4877eb9af4361452a425290b
+	sha256sums = 9cd2570e92e9bfeff3faf0d5b56334535cb2313f99ab0d9019b74d18ae1c7d0a
+	sha256sums = edf4d973ff197409d319bb6fbbaa529e53bc62347d26b0733c45a116a1b23f37
+	sha256sums = f910be9370c880de6e1d61cc30383c069e421d7acf406166e4fbfad324fc7d61
+	sha256sums = 064daaa2b9d95b96ec04d8ddebf4af441f92263d123365b58fe73966866080af
+	sha256sums = 34bcb151c0bc51ada5aa7beda6e87356e0eaafa83a621e11e5803717adc39ffc
+	sha256sums = b94b2e88f63cfb7087486508b8139599c89f96d7a4181c61fec4b4e250ca327a
 	sha256sums = e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711
 	sha256sums = cd844867b5b2197ad097662fee32579a7091dfba1d46cb438c4c7e696690440a
 	sha256sums = a0aae463d3190c358b018922aa25ef8b0d4dabf46d4e1a29437e983a2ea125c6
-	sha256sums = e01148a7e94bfd5ee288b5c5cf7df869aaae545cf48951c8d1f47264792cbf44
+	sha256sums = 8aa65f6d96cb1400b83092adab9a64e0d81a7f12bd6ee5e2b090d2d9407e645d
 	sha256sums = babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb
 	sha256sums = 34d08ea93cb4762cb33c7cffe931358008af32265fc720f2762f0179c3973574
 

PKGBUILD

@@ -10,10 +10,10 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=ungoogled-chromium-xdg
-pkgver=97.0.4692.99
+pkgver=99.0.4844.51
 pkgrel=1
 _launcher_ver=8
-_gcc_patchset=4
+_gcc_patchset=3
 pkgdesc="A lightweight approach to removing Google web service dependency - without creating a useless ~/.pki directory"
 arch=('x86_64')
 url="https://github.com/Eloston/ungoogled-chromium"
@@ -31,22 +31,22 @@ options=('!lto') # Chromium adds its own flags for ThinLTO
 source=(https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz
         https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver/chromium-launcher-$_launcher_ver.tar.gz
         https://github.com/stha09/chromium-patches/releases/download/chromium-${pkgver%%.*}-patchset-$_gcc_patchset/chromium-${pkgver%%.*}-patchset-$_gcc_patchset.tar.xz
-        wayland-fix-binding-to-wrong-version.patch
+        fix-build-break-with-system-libdrm.patch
+        sandbox-build-if-glibc-2.34-dynamic-stack-size-is-en.patch
+        webcodecs-stop-using-AudioOpusEncoder.patch
+        use-FT_Done_MM_Var-in-CFX_Font-AdjustMMParams.patch
         sql-make-VirtualCursor-standard-layout-type.patch
-        chromium-93-ffmpeg-4.4.patch
-        unbundle-ffmpeg-av_stream_get_first_dts.patch
-        unexpire-accelerated-video-decode-flag.patch
         use-oauth2-client-switches-as-default.patch
         xdg-basedir.patch
         no-omnibox-suggestion-autocomplete.patch)
-sha256sums=('c91bae205705b367f2cfc1f72ce1ee99b2ceb5edfc584e15c60a6ab5ff01ecba'
+sha256sums=('97c52e57eca0dc8b752d274047f38c88aaa86036c0587b26b056efbd3fb2bae3'
             '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
-            '7af5c0a55a20c0fb496b2f4448d89203a83bb1914754d864460e55e68731ef0b'
-            '29541840921302060f712838ba460cd7e988148af3ce3c9dc45437fc78442a67'
-            'dd317f85e5abfdcfc89c6f23f4c8edbcdebdd5e083dcec770e5da49ee647d150'
-            '1a9e074f417f8ffd78bcd6874d8e2e74a239905bf662f76a7755fa40dc476b57'
-            '1f0c1a7a1eb67d91765c9f28df815f58e1c6dc7b37d0acd4d68cac8e5515786c'
-            '2a97b26c3d6821b15ef4ef1369905c6fa3e9c8da4877eb9af4361452a425290b'
+            '9cd2570e92e9bfeff3faf0d5b56334535cb2313f99ab0d9019b74d18ae1c7d0a'
+            'edf4d973ff197409d319bb6fbbaa529e53bc62347d26b0733c45a116a1b23f37'
+            'f910be9370c880de6e1d61cc30383c069e421d7acf406166e4fbfad324fc7d61'
+            '064daaa2b9d95b96ec04d8ddebf4af441f92263d123365b58fe73966866080af'
+            '34bcb151c0bc51ada5aa7beda6e87356e0eaafa83a621e11e5803717adc39ffc'
+            'b94b2e88f63cfb7087486508b8139599c89f96d7a4181c61fec4b4e250ca327a'
             'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711'
             'cd844867b5b2197ad097662fee32579a7091dfba1d46cb438c4c7e696690440a'
             'a0aae463d3190c358b018922aa25ef8b0d4dabf46d4e1a29437e983a2ea125c6')
@@ -57,7 +57,7 @@ source=(${source[@]}
         chromium-drirc-disable-10bpc-color-configs.conf
         wayland-egl.patch)
 sha256sums=(${sha256sums[@]}
-            'e01148a7e94bfd5ee288b5c5cf7df869aaae545cf48951c8d1f47264792cbf44'
+            '8aa65f6d96cb1400b83092adab9a64e0d81a7f12bd6ee5e2b090d2d9407e645d'
             'babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb'
             '34d08ea93cb4762cb33c7cffe931358008af32265fc720f2762f0179c3973574')
 
@@ -106,15 +106,14 @@ prepare() {
   # runtime -- this allows signing into Chromium without baked-in values
   patch -Np1 -i ../use-oauth2-client-switches-as-default.patch
 
-  # Fix build with older ffmpeg
-  patch -Np1 -i ../chromium-93-ffmpeg-4.4.patch
+  # Upstream fixes
+  patch -Np1 -i ../fix-build-break-with-system-libdrm.patch
+  patch -Np1 -i ../sandbox-build-if-glibc-2.34-dynamic-stack-size-is-en.patch
+  patch -Np1 -i ../webcodecs-stop-using-AudioOpusEncoder.patch
+  patch -Np1 -d third_party/pdfium <../use-FT_Done_MM_Var-in-CFX_Font-AdjustMMParams.patch
 
-  # Substitute the custom function 'av_stream_get_first_dts'; will need to
-  # switch to bundled ffmpeg when we're no longer using ffmpeg 4.4 in Arch
-  # Upstream commit that made first_dts internal causing Chromium to add a
-  # custom function: https://github.com/FFmpeg/FFmpeg/commit/591b88e6787c4
-  # https://crbug.com/1251779
-  patch -Np1 -i ../unbundle-ffmpeg-av_stream_get_first_dts.patch
+  # https://chromium-review.googlesource.com/c/chromium/src/+/2862724
+  patch -Np1 -i ../sql-make-VirtualCursor-standard-layout-type.patch
 
   # move ~/.pki directory to ${XDG_DATA_HOME:-$HOME/.local}/share/pki
   patch -p1 -i ../xdg-basedir.patch
@@ -124,15 +123,6 @@ prepare() {
   # called 'shoulder surfing').
   patch -p1 -i ../no-omnibox-suggestion-autocomplete.patch
 
-  # https://crbug.com/1207478
-  patch -Np0 -i ../unexpire-accelerated-video-decode-flag.patch
-
-  # Upstream fixes
-  patch -Np1 -i ../wayland-fix-binding-to-wrong-version.patch
-
-  # https://chromium-review.googlesource.com/c/chromium/src/+/2862724
-  patch -Np1 -i ../sql-make-VirtualCursor-standard-layout-type.patch
-
   # Fixes for building with libstdc++ instead of libc++
   #patch -Np1 -i ../patches/
 
@@ -216,13 +206,21 @@ build() {
   CFLAGS+='   -Wno-unknown-warning-option'
   CXXFLAGS+=' -Wno-unknown-warning-option'
 
+  # Let Chromium set its own symbol level
+  CFLAGS=${CFLAGS/-g }
+  CXXFLAGS=${CXXFLAGS/-g }
+  # -fvar-tracking-assignments is not recognized by clang
+  CFLAGS=${CFLAGS/-fvar-tracking-assignments}
+  CXXFLAGS=${CXXFLAGS/-fvar-tracking-assignments}
+
   # https://github.com/ungoogled-software/ungoogled-chromium-archlinux/issues/123
   CFLAGS=${CFLAGS/-fexceptions}
   CFLAGS=${CFLAGS/-fcf-protection}
   CXXFLAGS=${CXXFLAGS/-fexceptions}
   CXXFLAGS=${CXXFLAGS/-fcf-protection}
  
-  # This appears to cause random segfaults
+  # This appears to cause random segfaults when combined with ThinLTO
+  # https://bugs.archlinux.org/task/73518
   CFLAGS=${CFLAGS/-fstack-clash-protection}
   CXXFLAGS=${CXXFLAGS/-fstack-clash-protection}
  

chromium-93-ffmpeg-4.4.patch

@@ -1,36 +0,0 @@
-diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
-index ac4713b07268..492a9a37d096 100644
---- a/media/filters/ffmpeg_demuxer.cc
-+++ b/media/filters/ffmpeg_demuxer.cc
-@@ -427,11 +427,11 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
-   scoped_refptr<DecoderBuffer> buffer;
- 
-   if (type() == DemuxerStream::TEXT) {
--    size_t id_size = 0;
-+    int id_size = 0;
-     uint8_t* id_data = av_packet_get_side_data(
-         packet.get(), AV_PKT_DATA_WEBVTT_IDENTIFIER, &id_size);
- 
--    size_t settings_size = 0;
-+    int settings_size = 0;
-     uint8_t* settings_data = av_packet_get_side_data(
-         packet.get(), AV_PKT_DATA_WEBVTT_SETTINGS, &settings_size);
- 
-@@ -443,7 +443,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
-     buffer = DecoderBuffer::CopyFrom(packet->data, packet->size,
-                                      side_data.data(), side_data.size());
-   } else {
--    size_t side_data_size = 0;
-+    int side_data_size = 0;
-     uint8_t* side_data = av_packet_get_side_data(
-         packet.get(), AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, &side_data_size);
- 
-@@ -504,7 +504,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) {
-                                        packet->size - data_offset);
-     }
- 
--    size_t skip_samples_size = 0;
-+    int skip_samples_size = 0;
-     const uint32_t* skip_samples_ptr =
-         reinterpret_cast<const uint32_t*>(av_packet_get_side_data(
-             packet.get(), AV_PKT_DATA_SKIP_SAMPLES, &skip_samples_size));

fix-build-break-with-system-libdrm.patch

@@ -0,0 +1,62 @@
+From 5b287e0be8d8d8475ec6ef81b16eaa61e19db078 Mon Sep 17 00:00:00 2001
+From: "Steinar H. Gunderson" <sesse@chromium.org>
+Date: Tue, 25 Jan 2022 19:14:53 +0000
+Subject: [PATCH] Fix build break with system libdrm.
+
+This patch is submitted on behalf of Andres Salomon
+<dilinger@queued.net> (on Cc). Also adding him to src/AUTHORS
+per policy, as he has signed the CLA.
+
+Original patch:
+https://salsa.debian.org/dilinger/chromium/-/commit/2333c2fb985ac1ef3d7331776a7833d965c63302
+
+Change-Id: I18bd60e2e80f2b9181e74ee7972c3f457ab33b10
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3401704
+Reviewed-by: Andres Calderon Jaramillo <andrescj@chromium.org>
+Commit-Queue: Steinar H Gunderson <sesse@chromium.org>
+Auto-Submit: Steinar H Gunderson <sesse@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#963119}
+---
+ AUTHORS                                      | 1 +
+ media/gpu/chromeos/BUILD.gn                  | 1 +
+ media/gpu/chromeos/video_decoder_pipeline.cc | 2 +-
+ 3 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/AUTHORS b/AUTHORS
+index 0eba3de5065..50edd3f6b38 100644
+--- a/AUTHORS
++++ b/AUTHORS
+@@ -93,6 +93,7 @@ Andreas Papacharalampous <andreas@apap04.com>
+ Andrei Borza <andrei.borza@gmail.com>
+ Andrei Parvu <andrei.prv@gmail.com>
+ Andrei Parvu <parvu@adobe.com>
++Andres Salomon <dilinger@queued.net>
+ Andreu Botella <andreu@andreubotella.com>
+ Andrew Boyarshin <andrew.boyarshin@gmail.com>
+ Andrew Brampton <me@bramp.net>
+diff --git a/media/gpu/chromeos/BUILD.gn b/media/gpu/chromeos/BUILD.gn
+index 7cb4c3ea39a..6fe21c15ecc 100644
+--- a/media/gpu/chromeos/BUILD.gn
++++ b/media/gpu/chromeos/BUILD.gn
+@@ -25,6 +25,7 @@ source_set("chromeos") {
+ 
+   deps = [
+     "//base",
++    "//build/config/linux/libdrm",
+     "//media",
+     "//media/gpu:buildflags",
+     "//media/gpu:command_buffer_helper",
+diff --git a/media/gpu/chromeos/video_decoder_pipeline.cc b/media/gpu/chromeos/video_decoder_pipeline.cc
+index d2f154ea0d8..416b9434a8d 100644
+--- a/media/gpu/chromeos/video_decoder_pipeline.cc
++++ b/media/gpu/chromeos/video_decoder_pipeline.cc
+@@ -28,8 +28,8 @@
+ #include "third_party/abseil-cpp/absl/types/optional.h"
+ 
+ #if BUILDFLAG(USE_VAAPI)
++#include <drm_fourcc.h>
+ #include "media/gpu/vaapi/vaapi_video_decoder.h"
+-#include "third_party/libdrm/src/include/drm/drm_fourcc.h"
+ #elif BUILDFLAG(USE_V4L2_CODEC)
+ #include "media/gpu/v4l2/v4l2_video_decoder.h"
+ #else

sandbox-build-if-glibc-2.34-dynamic-stack-size-is-en.patch

@@ -0,0 +1,39 @@
+From 28ac6a15411d01301e171b8a8b0019abd57589b9 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09@googlemail.com>
+Date: Mon, 7 Feb 2022 20:09:57 +0000
+Subject: [PATCH] sandbox: build if glibc 2.34+ dynamic stack size is enabled
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Compilation of sandbox fails when using dynamic stack size in glibc
+2.34 or newer. This is because the value is not a literal anymore but
+obtained through sysconf.
+
+To avoid this, use memset to put zeros in the buffer.
+
+Change-Id: Ia479e0f799b77a10a00197aaaa0500e62546f458
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3436947
+Reviewed-by: Jorge Lucangeli Obes <jorgelo@chromium.org>
+Commit-Queue: José Dapena Paz <jdapena@igalia.com>
+Cr-Commit-Position: refs/heads/main@{#967943}
+---
+ sandbox/linux/services/credentials.cc | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/sandbox/linux/services/credentials.cc b/sandbox/linux/services/credentials.cc
+index ca6b5954798..c933eafd163 100644
+--- a/sandbox/linux/services/credentials.cc
++++ b/sandbox/linux/services/credentials.cc
+@@ -100,7 +100,10 @@ bool ChrootToSafeEmptyDir() {
+   // TODO(crbug.com/1247458) Broken in MSan builds after LLVM f1bb30a4956f.
+   clone_flags |= CLONE_VM | CLONE_VFORK | CLONE_SETTLS;
+ 
+-  char tls_buf[PTHREAD_STACK_MIN] = {0};
++  // PTHREAD_STACK_MIN can be dynamic in glibc2.34+, so it is not possible to
++  // zeroify tls_buf assigning { 0 }
++  char tls_buf[PTHREAD_STACK_MIN];
++  memset(tls_buf, 0, PTHREAD_STACK_MIN);
+   tls = tls_buf;
+ #endif
+ 

sql-make-VirtualCursor-standard-layout-type.patch

@@ -1,30 +1,29 @@
-From 80368f8ba7a8bab13440463a254888311efe3986 Mon Sep 17 00:00:00 2001
+From 144479ad7b4287bee4067f95e4218f614798a865 Mon Sep 17 00:00:00 2001
 From: Stephan Hartmann <stha09@googlemail.com>
-Date: Tue, 4 May 2021 15:00:19 +0000
+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. Replace std::unique_ptr with
-raw pointers.
+gcc-11 libstdc++ fails because of this.
 
 Bug: 1189788
 Change-Id: Ia6dc388cc5ef1c0f2afc75f8ca45b9f12687ca9c
 ---
- sql/recover_module/btree.cc  | 21 +++++++++++++++------
- sql/recover_module/btree.h   | 17 +++++++++++++----
+ sql/recover_module/btree.cc  | 18 ++++++++++++------
+ sql/recover_module/btree.h   | 21 +++++++++++++++------
  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(-)
+ sql/recover_module/pager.cc  |  5 ++---
+ sql/recover_module/pager.h   |  6 +++---
+ 6 files changed, 45 insertions(+), 31 deletions(-)
 
 diff --git a/sql/recover_module/btree.cc b/sql/recover_module/btree.cc
-index 9ecaafe8a3..839318abf9 100644
+index cc9420e5c05..f12d8fa32a2 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,
+@@ -136,16 +136,22 @@ static_assert(std::is_trivially_destructible<LeafPageDecoder>::value,
                "Move the destructor to the .cc file if it's non-trival");
  #endif  // !DCHECK_IS_ON()
  
@@ -34,46 +33,47 @@ index 9ecaafe8a3..839318abf9 100644
 -      cell_count_(ComputeCellCount(db_reader)),
 -      next_read_index_(0),
 -      last_record_size_(0) {
++LeafPageDecoder::LeafPageDecoder() noexcept = default;
++
 +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(IsOnValidPage(db_reader));
    DCHECK(DatabasePageReader::IsValidPageId(page_id_));
  }
  
 +void LeafPageDecoder::Reset() {
 +  db_reader_ = nullptr;
-+  page_id_ = 0;
-+  cell_count_ = 0;
-+  next_read_index_ = 0;
-+  last_record_size_ = 0;
 +}
 +
  bool LeafPageDecoder::TryAdvance() {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
    DCHECK(CanAdvance());
 diff --git a/sql/recover_module/btree.h b/sql/recover_module/btree.h
-index d76d076bf6..33114b01fa 100644
+index eaa087a5c52..df0e0c937c0 100644
 --- a/sql/recover_module/btree.h
 +++ b/sql/recover_module/btree.h
-@@ -102,7 +102,7 @@ class LeafPageDecoder {
+@@ -101,9 +101,7 @@ class LeafPageDecoder {
+  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.
+-  // |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;
    ~LeafPageDecoder() noexcept = default;
  
    LeafPageDecoder(const LeafPageDecoder&) = delete;
-@@ -150,6 +150,15 @@ class LeafPageDecoder {
+@@ -151,6 +149,17 @@ class LeafPageDecoder {
    // 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
@@ -85,7 +85,7 @@ index d76d076bf6..33114b01fa 100644
    // 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.
@@ -104,10 +104,10 @@ index d76d076bf6..33114b01fa 100644
    // The reader's cursor state.
    //
 diff --git a/sql/recover_module/cursor.cc b/sql/recover_module/cursor.cc
-index 0029ff9295..42548bc4b5 100644
+index 4f827edf1b4..240de4999fe 100644
 --- a/sql/recover_module/cursor.cc
 +++ b/sql/recover_module/cursor.cc
-@@ -26,7 +26,7 @@ VirtualCursor::~VirtualCursor() {
+@@ -28,7 +28,7 @@ VirtualCursor::~VirtualCursor() {
  int VirtualCursor::First() {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
    inner_decoders_.clear();
@@ -116,7 +116,7 @@ index 0029ff9295..42548bc4b5 100644
  
    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 @@ index 0029ff9295..42548bc4b5 100644
          continue;
        }
        if (!record_reader_.Initialize())
-@@ -99,13 +99,13 @@ int VirtualCursor::ReadColumn(int column_index,
+@@ -101,13 +101,13 @@ int VirtualCursor::ReadColumn(int column_index,
  int64_t VirtualCursor::RowId() {
    DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
    DCHECK(record_reader_.IsInitialized());
@@ -159,7 +159,7 @@ index 0029ff9295..42548bc4b5 100644
        << __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(int page_id) {
      return;
  
    if (LeafPageDecoder::IsOnValidPage(&db_reader_)) {
@@ -169,10 +169,10 @@ index 0029ff9295..42548bc4b5 100644
    }
  
 diff --git a/sql/recover_module/cursor.h b/sql/recover_module/cursor.h
-index afcd6900e1..b15c31d425 100644
+index 845b7852648..cc4e85f83f9 100644
 --- a/sql/recover_module/cursor.h
 +++ b/sql/recover_module/cursor.h
-@@ -129,7 +129,7 @@ class VirtualCursor {
+@@ -130,7 +130,7 @@ class VirtualCursor {
    std::vector<std::unique_ptr<InnerPageDecoder>> inner_decoders_;
  
    // Decodes the leaf page containing records.
@@ -182,7 +182,7 @@ index afcd6900e1..b15c31d425 100644
    SEQUENCE_CHECKER(sequence_checker_);
  };
 diff --git a/sql/recover_module/pager.cc b/sql/recover_module/pager.cc
-index 58e75de270..5fe96204e5 100644
+index 58e75de2704..69d98cef98d 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(),
@@ -191,34 +191,34 @@ index 58e75de270..5fe96204e5 100644
  DatabasePageReader::DatabasePageReader(VirtualTable* table)
 -    : page_data_(std::make_unique<uint8_t[]>(table->page_size())),
 -      table_(table) {
-+    : page_data_(), table_(table) {
++    : page_data_(table->page_size()), table_(table) {
    DCHECK(table != nullptr);
    DCHECK(IsValidPageSize(table->page_size()));
  }
-@@ -57,8 +56,8 @@ int DatabasePageReader::ReadPage(int page_id) {
-                     std::numeric_limits<int64_t>::max(),
+@@ -58,7 +57,7 @@ int DatabasePageReader::ReadPage(int page_id) {
                  "The |read_offset| computation above may overflow");
  
--  int sqlite_status =
+   int sqlite_status =
 -      RawRead(sqlite_file, read_size, read_offset, page_data_.get());
-+  int sqlite_status = RawRead(sqlite_file, read_size, read_offset,
-+                              const_cast<uint8_t*>(page_data_.data()));
++      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
 diff --git a/sql/recover_module/pager.h b/sql/recover_module/pager.h
-index 0e388ddc3b..99314e30ff 100644
+index 07cac3cb989..d08f0932fab 100644
 --- a/sql/recover_module/pager.h
 +++ b/sql/recover_module/pager.h
-@@ -5,6 +5,7 @@
- #ifndef SQL_RECOVER_MODULE_PAGER_H_
+@@ -6,8 +6,8 @@
  #define SQL_RECOVER_MODULE_PAGER_H_
  
-+#include <array>
  #include <cstdint>
- #include <memory>
+-#include <memory>
+ #include <ostream>
++#include <vector>
  
-@@ -70,7 +71,7 @@ class DatabasePageReader {
+ #include "base/check_op.h"
+ #include "base/memory/raw_ptr.h"
+@@ -72,7 +72,7 @@ class DatabasePageReader {
      DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
      DCHECK_NE(page_id_, kInvalidPageId)
          << "Successful ReadPage() required before accessing pager state";
@@ -227,12 +227,12 @@ index 0e388ddc3b..99314e30ff 100644
    }
  
    // The number of bytes in the page read by the last ReadPage() call.
-@@ -137,7 +138,7 @@ class DatabasePageReader {
+@@ -139,7 +139,7 @@ class DatabasePageReader {
    int page_id_ = kInvalidPageId;
    // Stores the bytes of the last page successfully read by ReadPage().
    // The content is undefined if the last call to ReadPage() did not succeed.
 -  const std::unique_ptr<uint8_t[]> page_data_;
-+  const std::array<uint8_t, kMaxPageSize> page_data_;
++  std::vector<uint8_t> 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_;

use-FT_Done_MM_Var-in-CFX_Font-AdjustMMParams.patch

@@ -0,0 +1,71 @@
+From ffeb67faf715475f6e463d65c368f556780adf19 Mon Sep 17 00:00:00 2001
+From: Lei Zhang <thestig@chromium.org>
+Date: Mon, 31 Jan 2022 22:42:35 +0000
+Subject: [PATCH] Use FT_Done_MM_Var() in CFX_Font::AdjustMMParams() when
+ possible.
+
+When FreeType has FT_Done_MM_Var(), use that to free memory in
+CFX_Font::AdjustMMParams() to avoid mismatched alloc/free functions.
+
+Bug: pdfium:1400
+Change-Id: I044540893103921fc64cdd53fcd628cfebf2c9db
+Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/90130
+Reviewed-by: Nigi <nigi@chromium.org>
+Commit-Queue: Lei Zhang <thestig@chromium.org>
+---
+ core/fxge/cfx_font.cpp | 28 ++++++++++++++++++++++++++--
+ 1 file changed, 26 insertions(+), 2 deletions(-)
+
+diff --git a/core/fxge/cfx_font.cpp b/core/fxge/cfx_font.cpp
+index c08fe9608..8b3a72700 100644
+--- a/core/fxge/cfx_font.cpp
++++ b/core/fxge/cfx_font.cpp
+@@ -44,6 +44,30 @@ struct OUTLINE_PARAMS {
+   float m_CoordUnit;
+ };
+ 
++// TODO(crbug.com/pdfium/1400): When FT_Done_MM_Var() is more likely to be
++// available to all users in the future, remove FreeMMVar() and use
++// FT_Done_MM_Var() directly.
++//
++// Use weak symbols to check if FT_Done_MM_Var() is available at runtime.
++#if !BUILDFLAG(IS_WIN)
++extern "C" __attribute__((weak)) decltype(FT_Done_MM_Var) FT_Done_MM_Var;
++#endif
++
++void FreeMMVar(FXFT_FaceRec* rec, FXFT_MM_VarPtr variation_desc) {
++#if BUILDFLAG(IS_WIN)
++  // Assume `use_system_freetype` GN var is never set on Windows.
++  constexpr bool has_ft_done_mm_var_func = true;
++#else
++  static const bool has_ft_done_mm_var_func = !!FT_Done_MM_Var;
++#endif
++  if (has_ft_done_mm_var_func) {
++    FT_Done_MM_Var(CFX_GEModule::Get()->GetFontMgr()->GetFTLibrary(),
++                   variation_desc);
++  } else {
++    FXFT_Free(rec, variation_desc);
++  }
++}
++
+ FX_RECT FXRectFromFTPos(FT_Pos left, FT_Pos top, FT_Pos right, FT_Pos bottom) {
+   return FX_RECT(pdfium::base::checked_cast<int32_t>(left),
+                  pdfium::base::checked_cast<int32_t>(top),
+@@ -645,7 +669,7 @@ void CFX_Font::AdjustMMParams(int glyph_index,
+     FT_Pos max_width = FXFT_Get_Glyph_HoriAdvance(m_Face->GetRec()) * 1000 /
+                        FXFT_Get_Face_UnitsPerEM(m_Face->GetRec());
+     if (max_width == min_width) {
+-      FXFT_Free(m_Face->GetRec(), pMasters);
++      FreeMMVar(m_Face->GetRec(), pMasters);
+       return;
+     }
+     FT_Pos param = min_param + (max_param - min_param) *
+@@ -653,7 +677,7 @@ void CFX_Font::AdjustMMParams(int glyph_index,
+                                    (max_width - min_width);
+     coords[1] = param;
+   }
+-  FXFT_Free(m_Face->GetRec(), pMasters);
++  FreeMMVar(m_Face->GetRec(), pMasters);
+   FT_Set_MM_Design_Coordinates(m_Face->GetRec(), 2, coords);
+ }
+ 

wayland-fix-binding-to-wrong-version.patch

@@ -1,683 +0,0 @@
-From 5e3ed3d015d0ddae5e4d813204616d89d2f859c7 Mon Sep 17 00:00:00 2001
-From: Alexander Dunaev <adunaev@igalia.com>
-Date: Tue, 14 Dec 2021 09:54:52 +0000
-Subject: [PATCH 1/2] [linux/wayland] Fixed terminate caused by binding to
- wrong version.
-
-The Ozone/Wayland implementation had a few places where the Wayland
-objects were bound without proper checking for their versions.  That was
-part of the technical debt not addressed before, and ended up causing
-the issue explained in the linked crbug: the compositor terminates the
-client that binds to the protocol that it does not actually support.
-
-This patch fixes the issue by adding the necessary checks in all places
-where they were missing.  Also a convenience macro for validating the
-version is proposed.
-
-Bug: 1279574
-Change-Id: I74efa97f64b480bed47372d8d559593ae84eeb18
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3337037
-Reviewed-by: Maksim Sisov <msisov@igalia.com>
-Commit-Queue: Alexander Dunaev <adunaev@igalia.com>
-Cr-Commit-Position: refs/heads/main@{#951428}
-
-(cherry picked from commit dd4c3ddadbb9869f59cee201a38e9ca3b9154f4d)
----
- .../platform/wayland/common/wayland_object.cc | 21 +++++++++++++++++++
- .../platform/wayland/common/wayland_object.h  | 11 ++++++++++
- .../gtk_primary_selection_device_manager.cc   | 11 +++++-----
- ui/ozone/platform/wayland/host/gtk_shell1.cc  | 12 ++++++-----
- .../wayland/host/org_kde_kwin_idle.cc         |  9 ++++----
- .../wayland/host/overlay_prioritizer.cc       |  9 ++++----
- .../wayland/host/surface_augmenter.cc         | 11 ++++++----
- .../host/wayland_data_device_manager.cc       |  9 +++++---
- ui/ozone/platform/wayland/host/wayland_drm.cc |  6 ++++--
- .../platform/wayland/host/wayland_output.cc   | 10 ++++-----
- ui/ozone/platform/wayland/host/wayland_shm.cc |  9 ++++----
- .../wayland/host/wayland_zaura_shell.cc       |  9 +++++---
- .../wayland/host/wayland_zcr_cursor_shapes.cc | 10 +++++----
- .../wayland/host/wayland_zwp_linux_dmabuf.cc  |  9 +++++---
- .../host/wayland_zwp_pointer_constraints.cc   |  6 +++---
- .../host/wayland_zwp_pointer_gestures.cc      |  7 ++++---
- .../wayland_zwp_relative_pointer_manager.cc   |  8 ++++---
- .../wayland/host/xdg_foreign_wrapper.cc       | 14 ++++++++-----
- .../wayland/host/zwp_idle_inhibit_manager.cc  | 10 +++++----
- .../zwp_primary_selection_device_manager.cc   |  9 ++++----
- 20 files changed, 131 insertions(+), 69 deletions(-)
-
-diff --git a/ui/ozone/platform/wayland/common/wayland_object.cc b/ui/ozone/platform/wayland/common/wayland_object.cc
-index 0374cb9d874..8faa648120d 100644
---- a/ui/ozone/platform/wayland/common/wayland_object.cc
-+++ b/ui/ozone/platform/wayland/common/wayland_object.cc
-@@ -35,6 +35,8 @@
- #include <xdg-shell-client-protocol.h>
- #include <xdg-shell-unstable-v6-client-protocol.h>
- 
-+#include "base/logging.h"
-+
- namespace wl {
- namespace {
- 
-@@ -77,6 +79,25 @@ void delete_touch(wl_touch* touch) {
- 
- }  // namespace
- 
-+bool CanBind(const std::string& interface,
-+             uint32_t available_version,
-+             uint32_t min_version,
-+             uint32_t max_version) {
-+  if (available_version < min_version) {
-+    LOG(WARNING) << "Unable to bind to " << interface << " version "
-+                 << available_version << ".  The minimum supported version is "
-+                 << min_version << ".";
-+    return false;
-+  }
-+
-+  if (available_version > max_version) {
-+    LOG(WARNING) << "Binding to " << interface << " version " << max_version
-+                 << " but version " << available_version << " is available.";
-+  }
-+
-+  return true;
-+}
-+
- void (*ObjectTraits<wl_cursor_theme>::deleter)(wl_cursor_theme*) =
-     &wl_cursor_theme_destroy;
- 
-diff --git a/ui/ozone/platform/wayland/common/wayland_object.h b/ui/ozone/platform/wayland/common/wayland_object.h
-index 3a8bb9e494d..ce787bf8805 100644
---- a/ui/ozone/platform/wayland/common/wayland_object.h
-+++ b/ui/ozone/platform/wayland/common/wayland_object.h
-@@ -79,6 +79,17 @@ struct ObjectTraits<wl_proxy> {
-   static void (*deleter)(void*);
- };
- 
-+// Checks the given |available_version| exposed by the server against
-+// |min_version| and |max_version| supported by the client.
-+// Returns false (with rendering a warning) if |available_version| is less than
-+// the minimum supported version.
-+// Returns true otherwise, renders an info message if |available_version| is
-+// greater than the maximum supported one.
-+bool CanBind(const std::string& interface,
-+             uint32_t available_version,
-+             uint32_t min_version,
-+             uint32_t max_version);
-+
- }  // namespace wl
- 
- // Puts the forward declaration for struct TYPE and declares the template
-diff --git a/ui/ozone/platform/wayland/host/gtk_primary_selection_device_manager.cc b/ui/ozone/platform/wayland/host/gtk_primary_selection_device_manager.cc
-index af3087d1891..2991233fe6e 100644
---- a/ui/ozone/platform/wayland/host/gtk_primary_selection_device_manager.cc
-+++ b/ui/ozone/platform/wayland/host/gtk_primary_selection_device_manager.cc
-@@ -16,7 +16,7 @@
- namespace ui {
- 
- namespace {
--constexpr uint32_t kMaxGtkPrimarySelectionDeviceManagerVersion = 1;
-+constexpr uint32_t kMinVersion = 1;
- }
- 
- // static
-@@ -31,12 +31,13 @@ void GtkPrimarySelectionDeviceManager::Instantiate(
-     uint32_t version) {
-   DCHECK_EQ(interface, kInterfaceName);
- 
--  if (connection->gtk_primary_selection_device_manager())
-+  if (connection->gtk_primary_selection_device_manager() ||
-+      !wl::CanBind(interface, version, kMinVersion, kMinVersion)) {
-     return;
-+  }
- 
--  auto manager = wl::Bind<gtk_primary_selection_device_manager>(
--      registry, name,
--      std::min(version, kMaxGtkPrimarySelectionDeviceManagerVersion));
-+  auto manager = wl::Bind<gtk_primary_selection_device_manager>(registry, name,
-+                                                                kMinVersion);
-   if (!manager) {
-     LOG(ERROR) << "Failed to bind gtk_primary_selection_device_manager";
-     return;
-diff --git a/ui/ozone/platform/wayland/host/gtk_shell1.cc b/ui/ozone/platform/wayland/host/gtk_shell1.cc
-index cb3b0c8fa02..26dfd7fbf3f 100644
---- a/ui/ozone/platform/wayland/host/gtk_shell1.cc
-+++ b/ui/ozone/platform/wayland/host/gtk_shell1.cc
-@@ -17,8 +17,8 @@ namespace {
- // gtk_shell1 exposes request_focus() since version 3.  Below that, it is not
- // interesting for us, although it provides some shell integration that might be
- // useful.
--constexpr uint32_t kMinGtkShell1Version = 3;
--constexpr uint32_t kMaxGtkShell1Version = 4;
-+constexpr uint32_t kMinVersion = 3;
-+constexpr uint32_t kMaxVersion = 4;
- }  // namespace
- 
- // static
-@@ -32,11 +32,13 @@ void GtkShell1::Instantiate(WaylandConnection* connection,
-                             uint32_t version) {
-   DCHECK_EQ(interface, kInterfaceName);
- 
--  if (connection->gtk_shell1_ || version < kMinGtkShell1Version)
-+  if (connection->gtk_shell1_ ||
-+      !wl::CanBind(interface, version, kMinVersion, kMaxVersion)) {
-     return;
-+  }
- 
--  auto gtk_shell1 = wl::Bind<::gtk_shell1>(
--      registry, name, std::min(version, kMaxGtkShell1Version));
-+  auto gtk_shell1 =
-+      wl::Bind<::gtk_shell1>(registry, name, std::min(version, kMaxVersion));
-   if (!gtk_shell1) {
-     LOG(ERROR) << "Failed to bind gtk_shell1";
-     return;
-diff --git a/ui/ozone/platform/wayland/host/org_kde_kwin_idle.cc b/ui/ozone/platform/wayland/host/org_kde_kwin_idle.cc
-index 4746aa798c0..8b7a7416d95 100644
---- a/ui/ozone/platform/wayland/host/org_kde_kwin_idle.cc
-+++ b/ui/ozone/platform/wayland/host/org_kde_kwin_idle.cc
-@@ -13,7 +13,7 @@ namespace ui {
- 
- namespace {
- 
--constexpr uint32_t kMaxOrgKdeKwinIdleVersion = 1;
-+constexpr uint32_t kMinVersion = 1;
- 
- // After the system has gone idle, it will wait for this time before notifying
- // us.  This reduces "jitter" of the idle/active state, but also adds some lag
-@@ -58,11 +58,12 @@ void OrgKdeKwinIdle::Instantiate(WaylandConnection* connection,
-                                  uint32_t version) {
-   DCHECK_EQ(interface, kInterfaceName);
- 
--  if (connection->org_kde_kwin_idle_)
-+  if (connection->org_kde_kwin_idle_ ||
-+      !wl::CanBind(interface, version, kMinVersion, kMinVersion)) {
-     return;
-+  }
- 
--  auto idle = wl::Bind<struct org_kde_kwin_idle>(
--      registry, name, std::min(version, kMaxOrgKdeKwinIdleVersion));
-+  auto idle = wl::Bind<struct org_kde_kwin_idle>(registry, name, kMinVersion);
-   if (!idle) {
-     LOG(ERROR) << "Failed to bind to org_kde_kwin_idle global";
-     return;
-diff --git a/ui/ozone/platform/wayland/host/overlay_prioritizer.cc b/ui/ozone/platform/wayland/host/overlay_prioritizer.cc
-index e8aaf39a337..11496b52324 100644
---- a/ui/ozone/platform/wayland/host/overlay_prioritizer.cc
-+++ b/ui/ozone/platform/wayland/host/overlay_prioritizer.cc
-@@ -12,7 +12,7 @@
- namespace ui {
- 
- namespace {
--constexpr uint32_t kMaxOverlayPrioritizerVersion = 1;
-+constexpr uint32_t kMinVersion = 1;
- }
- 
- // static
-@@ -26,11 +26,12 @@ void OverlayPrioritizer::Instantiate(WaylandConnection* connection,
-                                      uint32_t version) {
-   DCHECK_EQ(interface, kInterfaceName);
- 
--  if (connection->overlay_prioritizer_)
-+  if (connection->overlay_prioritizer_ ||
-+      !wl::CanBind(interface, version, kMinVersion, kMinVersion)) {
-     return;
-+  }
- 
--  auto prioritizer = wl::Bind<overlay_prioritizer>(
--      registry, name, std::min(version, kMaxOverlayPrioritizerVersion));
-+  auto prioritizer = wl::Bind<overlay_prioritizer>(registry, name, kMinVersion);
-   if (!prioritizer) {
-     LOG(ERROR) << "Failed to bind overlay_prioritizer";
-     return;
-diff --git a/ui/ozone/platform/wayland/host/surface_augmenter.cc b/ui/ozone/platform/wayland/host/surface_augmenter.cc
-index 8294897bcd5..0589076bcf5 100644
---- a/ui/ozone/platform/wayland/host/surface_augmenter.cc
-+++ b/ui/ozone/platform/wayland/host/surface_augmenter.cc
-@@ -13,7 +13,8 @@
- namespace ui {
- 
- namespace {
--constexpr uint32_t kMaxSurfaceAugmenterVersion = 1;
-+constexpr uint32_t kMinVersion = 1;
-+constexpr uint32_t kMaxVersion = 1;
- }
- 
- // static
-@@ -27,11 +28,13 @@ void SurfaceAugmenter::Instantiate(WaylandConnection* connection,
-                                    uint32_t version) {
-   DCHECK_EQ(interface, kInterfaceName);
- 
--  if (connection->surface_augmenter_)
-+  if (connection->surface_augmenter_ ||
-+      !wl::CanBind(interface, version, kMinVersion, kMaxVersion)) {
-     return;
-+  }
- 
--  auto augmenter = wl::Bind<surface_augmenter>(
--      registry, name, std::min(version, kMaxSurfaceAugmenterVersion));
-+  auto augmenter = wl::Bind<surface_augmenter>(registry, name,
-+                                               std::min(version, kMaxVersion));
-   if (!augmenter) {
-     LOG(ERROR) << "Failed to bind overlay_prioritizer";
-     return;
-diff --git a/ui/ozone/platform/wayland/host/wayland_data_device_manager.cc b/ui/ozone/platform/wayland/host/wayland_data_device_manager.cc
-index 408cb1c72f4..0f03942e699 100644
---- a/ui/ozone/platform/wayland/host/wayland_data_device_manager.cc
-+++ b/ui/ozone/platform/wayland/host/wayland_data_device_manager.cc
-@@ -14,7 +14,8 @@
- namespace ui {
- 
- namespace {
--constexpr uint32_t kMaxDeviceManagerVersion = 3;
-+constexpr uint32_t kMinVersion = 1;
-+constexpr uint32_t kMaxVersion = 3;
- }
- 
- // static
-@@ -28,11 +29,13 @@ void WaylandDataDeviceManager::Instantiate(WaylandConnection* connection,
-                                            uint32_t version) {
-   DCHECK_EQ(interface, kInterfaceName);
- 
--  if (connection->data_device_manager_)
-+  if (connection->data_device_manager_ ||
-+      !wl::CanBind(interface, version, kMinVersion, kMaxVersion)) {
-     return;
-+  }
- 
-   auto data_device_manager = wl::Bind<wl_data_device_manager>(
--      registry, name, std::min(version, kMaxDeviceManagerVersion));
-+      registry, name, std::min(version, kMaxVersion));
-   if (!data_device_manager) {
-     LOG(ERROR) << "Failed to bind to wl_data_device_manager global";
-     return;
-diff --git a/ui/ozone/platform/wayland/host/wayland_drm.cc b/ui/ozone/platform/wayland/host/wayland_drm.cc
-index d806e8e9f5d..a7ed2e20ffe 100644
---- a/ui/ozone/platform/wayland/host/wayland_drm.cc
-+++ b/ui/ozone/platform/wayland/host/wayland_drm.cc
-@@ -17,7 +17,7 @@
- namespace ui {
- 
- namespace {
--constexpr uint32_t kMinWlDrmVersion = 2;
-+constexpr uint32_t kMinVersion = 2;
- }
- 
- // static
-@@ -31,8 +31,10 @@ void WaylandDrm::Instantiate(WaylandConnection* connection,
-                              uint32_t version) {
-   DCHECK_EQ(interface, kInterfaceName);
- 
--  if (connection->drm_ || version < kMinWlDrmVersion)
-+  if (connection->drm_ ||
-+      !!wl::CanBind(interface, version, kMinVersion, kMinVersion)) {
-     return;
-+  }
- 
-   auto wl_drm = wl::Bind<struct wl_drm>(registry, name, version);
-   if (!wl_drm) {
-diff --git a/ui/ozone/platform/wayland/host/wayland_output.cc b/ui/ozone/platform/wayland/host/wayland_output.cc
-index 2d481d1167e..13e2b2ea685 100644
---- a/ui/ozone/platform/wayland/host/wayland_output.cc
-+++ b/ui/ozone/platform/wayland/host/wayland_output.cc
-@@ -16,7 +16,8 @@
- namespace ui {
- 
- namespace {
--constexpr uint32_t kMinWlOutputVersion = 2;
-+// TODO(crbug.com/1279681): support newer versions.
-+constexpr uint32_t kMinVersion = 2;
- }
- 
- // static
-@@ -30,14 +31,11 @@ void WaylandOutput::Instantiate(WaylandConnection* connection,
-                                 uint32_t version) {
-   DCHECK_EQ(interface, kInterfaceName);
- 
--  if (version < kMinWlOutputVersion) {
--    LOG(ERROR)
--        << "Unable to bind to the unsupported wl_output object with version= "
--        << version << ". Minimum supported version is " << kMinWlOutputVersion;
-+  if (!wl::CanBind(interface, version, kMinVersion, kMinVersion)) {
-     return;
-   }
- 
--  auto output = wl::Bind<wl_output>(registry, name, version);
-+  auto output = wl::Bind<wl_output>(registry, name, kMinVersion);
-   if (!output) {
-     LOG(ERROR) << "Failed to bind to wl_output global";
-     return;
-diff --git a/ui/ozone/platform/wayland/host/wayland_shm.cc b/ui/ozone/platform/wayland/host/wayland_shm.cc
-index 7c6cd40569d..de97ad1c2b2 100644
---- a/ui/ozone/platform/wayland/host/wayland_shm.cc
-+++ b/ui/ozone/platform/wayland/host/wayland_shm.cc
-@@ -10,7 +10,7 @@
- namespace ui {
- 
- namespace {
--constexpr uint32_t kMaxShmVersion = 1;
-+constexpr uint32_t kMinVersion = 1;
- constexpr uint32_t kShmFormat = WL_SHM_FORMAT_ARGB8888;
- }  // namespace
- 
-@@ -25,11 +25,12 @@ void WaylandShm::Instantiate(WaylandConnection* connection,
-                              uint32_t version) {
-   DCHECK_EQ(interface, kInterfaceName);
- 
--  if (connection->shm_)
-+  if (connection->shm_ ||
-+      !wl::CanBind(interface, version, kMinVersion, kMinVersion)) {
-     return;
-+  }
- 
--  auto shm =
--      wl::Bind<wl_shm>(registry, name, std::min(version, kMaxShmVersion));
-+  auto shm = wl::Bind<wl_shm>(registry, name, kMinVersion);
-   if (!shm) {
-     LOG(ERROR) << "Failed to bind to wl_shm global";
-     return;
-diff --git a/ui/ozone/platform/wayland/host/wayland_zaura_shell.cc b/ui/ozone/platform/wayland/host/wayland_zaura_shell.cc
-index b1ae436db08..1b5585f7c18 100644
---- a/ui/ozone/platform/wayland/host/wayland_zaura_shell.cc
-+++ b/ui/ozone/platform/wayland/host/wayland_zaura_shell.cc
-@@ -19,7 +19,8 @@
- namespace ui {
- 
- namespace {
--constexpr uint32_t kMaxAuraShellVersion = 28;
-+constexpr uint32_t kMinVersion = 1;
-+constexpr uint32_t kMaxVersion = 28;
- }
- 
- // static
-@@ -33,11 +34,13 @@ void WaylandZAuraShell::Instantiate(WaylandConnection* connection,
-                                     uint32_t version) {
-   DCHECK_EQ(interface, kInterfaceName);
- 
--  if (connection->zaura_shell_)
-+  if (connection->zaura_shell_ ||
-+      !wl::CanBind(interface, version, kMinVersion, kMaxVersion)) {
-     return;
-+  }
- 
-   auto zaura_shell = wl::Bind<struct zaura_shell>(
--      registry, name, std::min(version, kMaxAuraShellVersion));
-+      registry, name, std::min(version, kMaxVersion));
-   if (!zaura_shell) {
-     LOG(ERROR) << "Failed to bind zaura_shell";
-     return;
-diff --git a/ui/ozone/platform/wayland/host/wayland_zcr_cursor_shapes.cc b/ui/ozone/platform/wayland/host/wayland_zcr_cursor_shapes.cc
-index 094a2f98686..84d847eea16 100644
---- a/ui/ozone/platform/wayland/host/wayland_zcr_cursor_shapes.cc
-+++ b/ui/ozone/platform/wayland/host/wayland_zcr_cursor_shapes.cc
-@@ -16,7 +16,7 @@
- namespace ui {
- 
- namespace {
--constexpr uint32_t kMaxCursorShapesVersion = 1;
-+constexpr uint32_t kMinVersion = 1;
- }
- 
- using mojom::CursorType;
-@@ -32,11 +32,13 @@ void WaylandZcrCursorShapes::Instantiate(WaylandConnection* connection,
-                                          uint32_t version) {
-   DCHECK_EQ(interface, kInterfaceName);
- 
--  if (connection->zcr_cursor_shapes_)
-+  if (connection->zcr_cursor_shapes_ ||
-+      !wl::CanBind(interface, version, kMinVersion, kMinVersion)) {
-     return;
-+  }
- 
--  auto zcr_cursor_shapes = wl::Bind<zcr_cursor_shapes_v1>(
--      registry, name, std::min(version, kMaxCursorShapesVersion));
-+  auto zcr_cursor_shapes =
-+      wl::Bind<zcr_cursor_shapes_v1>(registry, name, kMinVersion);
-   if (!zcr_cursor_shapes) {
-     LOG(ERROR) << "Failed to bind zcr_cursor_shapes_v1";
-     return;
-diff --git a/ui/ozone/platform/wayland/host/wayland_zwp_linux_dmabuf.cc b/ui/ozone/platform/wayland/host/wayland_zwp_linux_dmabuf.cc
-index 7035dc4ed26..cee793b9ae8 100644
---- a/ui/ozone/platform/wayland/host/wayland_zwp_linux_dmabuf.cc
-+++ b/ui/ozone/platform/wayland/host/wayland_zwp_linux_dmabuf.cc
-@@ -14,7 +14,8 @@
- namespace ui {
- 
- namespace {
--constexpr uint32_t kMaxLinuxDmabufVersion = 3;
-+constexpr uint32_t kMinVersion = 1;
-+constexpr uint32_t kMaxVersion = 3;
- }
- 
- // static
-@@ -28,11 +29,13 @@ void WaylandZwpLinuxDmabuf::Instantiate(WaylandConnection* connection,
-                                         uint32_t version) {
-   DCHECK_EQ(interface, kInterfaceName);
- 
--  if (connection->zwp_dmabuf())
-+  if (connection->zwp_dmabuf() ||
-+      !wl::CanBind(interface, version, kMinVersion, kMaxVersion)) {
-     return;
-+  }
- 
-   auto zwp_linux_dmabuf = wl::Bind<zwp_linux_dmabuf_v1>(
--      registry, name, std::min(version, kMaxLinuxDmabufVersion));
-+      registry, name, std::min(version, kMaxVersion));
-   if (!zwp_linux_dmabuf) {
-     LOG(ERROR) << "Failed to bind zwp_linux_dmabuf_v1";
-     return;
-diff --git a/ui/ozone/platform/wayland/host/wayland_zwp_pointer_constraints.cc b/ui/ozone/platform/wayland/host/wayland_zwp_pointer_constraints.cc
-index 24e4dacc7ee..c1aca770ff5 100644
---- a/ui/ozone/platform/wayland/host/wayland_zwp_pointer_constraints.cc
-+++ b/ui/ozone/platform/wayland/host/wayland_zwp_pointer_constraints.cc
-@@ -15,7 +15,7 @@
- namespace ui {
- 
- namespace {
--constexpr uint32_t kMinZwpPointerConstraintsVersion = 1;
-+constexpr uint32_t kMinVersion = 1;
- }
- 
- // static
-@@ -30,12 +30,12 @@ void WaylandZwpPointerConstraints::Instantiate(WaylandConnection* connection,
-   DCHECK_EQ(interface, kInterfaceName);
- 
-   if (connection->wayland_zwp_pointer_constraints_ ||
--      version < kMinZwpPointerConstraintsVersion) {
-+      !wl::CanBind(interface, version, kMinVersion, kMinVersion)) {
-     return;
-   }
- 
-   auto zwp_pointer_constraints_v1 =
--      wl::Bind<struct zwp_pointer_constraints_v1>(registry, name, version);
-+      wl::Bind<struct zwp_pointer_constraints_v1>(registry, name, kMinVersion);
-   if (!zwp_pointer_constraints_v1) {
-     LOG(ERROR) << "Failed to bind wp_pointer_constraints_v1";
-     return;
-diff --git a/ui/ozone/platform/wayland/host/wayland_zwp_pointer_gestures.cc b/ui/ozone/platform/wayland/host/wayland_zwp_pointer_gestures.cc
-index 5d96c8923fd..31bffb726c6 100644
---- a/ui/ozone/platform/wayland/host/wayland_zwp_pointer_gestures.cc
-+++ b/ui/ozone/platform/wayland/host/wayland_zwp_pointer_gestures.cc
-@@ -19,7 +19,7 @@
- namespace ui {
- 
- namespace {
--constexpr uint32_t kMinZwpPointerGesturesVersion = 1;
-+constexpr uint32_t kMinVersion = 1;
- }
- 
- // static
-@@ -34,11 +34,12 @@ void WaylandZwpPointerGestures::Instantiate(WaylandConnection* connection,
-   DCHECK_EQ(interface, kInterfaceName);
- 
-   if (connection->wayland_zwp_pointer_gestures_ ||
--      version < kMinZwpPointerGesturesVersion)
-+      !wl::CanBind(interface, version, kMinVersion, kMinVersion)) {
-     return;
-+  }
- 
-   auto zwp_pointer_gestures_v1 =
--      wl::Bind<struct zwp_pointer_gestures_v1>(registry, name, version);
-+      wl::Bind<struct zwp_pointer_gestures_v1>(registry, name, kMinVersion);
-   if (!zwp_pointer_gestures_v1) {
-     LOG(ERROR) << "Failed to bind wp_pointer_gestures_v1";
-     return;
-diff --git a/ui/ozone/platform/wayland/host/wayland_zwp_relative_pointer_manager.cc b/ui/ozone/platform/wayland/host/wayland_zwp_relative_pointer_manager.cc
-index 3a8ef4c7f96..c84a891dfe7 100644
---- a/ui/ozone/platform/wayland/host/wayland_zwp_relative_pointer_manager.cc
-+++ b/ui/ozone/platform/wayland/host/wayland_zwp_relative_pointer_manager.cc
-@@ -14,7 +14,7 @@
- namespace ui {
- 
- namespace {
--constexpr uint32_t kMinZwpRelativePointerManagerVersion = 1;
-+constexpr uint32_t kMinVersion = 1;
- }
- 
- // static
-@@ -30,11 +30,13 @@ void WaylandZwpRelativePointerManager::Instantiate(
-   DCHECK_EQ(interface, kInterfaceName);
- 
-   if (connection->wayland_zwp_relative_pointer_manager_ ||
--      version < kMinZwpRelativePointerManagerVersion)
-+      !wl::CanBind(interface, version, kMinVersion, kMinVersion)) {
-     return;
-+  }
- 
-   auto zwp_relative_pointer_manager_v1 =
--      wl::Bind<struct zwp_relative_pointer_manager_v1>(registry, name, version);
-+      wl::Bind<struct zwp_relative_pointer_manager_v1>(registry, name,
-+                                                       kMinVersion);
-   if (!zwp_relative_pointer_manager_v1) {
-     LOG(ERROR) << "Failed to bind zwp_relative_pointer_manager_v1";
-     return;
-diff --git a/ui/ozone/platform/wayland/host/xdg_foreign_wrapper.cc b/ui/ozone/platform/wayland/host/xdg_foreign_wrapper.cc
-index a34b684d128..2586adf9b85 100644
---- a/ui/ozone/platform/wayland/host/xdg_foreign_wrapper.cc
-+++ b/ui/ozone/platform/wayland/host/xdg_foreign_wrapper.cc
-@@ -19,6 +19,8 @@ constexpr char XdgForeignWrapper::kInterfaceNameV1[];
- // static
- constexpr char XdgForeignWrapper::kInterfaceNameV2[];
- 
-+constexpr uint32_t kMinVersion = 1;
-+
- using OnHandleExported = XdgForeignWrapper::OnHandleExported;
- 
- namespace {
-@@ -185,15 +187,17 @@ void XdgForeignWrapper::Instantiate(WaylandConnection* connection,
-                                     uint32_t name,
-                                     const std::string& interface,
-                                     uint32_t version) {
--  if (connection->xdg_foreign_)
-+  if (connection->xdg_foreign_ ||
-+      !wl::CanBind(interface, version, kMinVersion, kMinVersion)) {
-     return;
-+  }
- 
-   if (interface == kInterfaceNameV1) {
--    connection->xdg_foreign_ =
--        CreateWrapper<zxdg_exporter_v1>(connection, registry, name, version);
-+    connection->xdg_foreign_ = CreateWrapper<zxdg_exporter_v1>(
-+        connection, registry, name, kMinVersion);
-   } else if (interface == kInterfaceNameV2) {
--    connection->xdg_foreign_ =
--        CreateWrapper<zxdg_exporter_v2>(connection, registry, name, version);
-+    connection->xdg_foreign_ = CreateWrapper<zxdg_exporter_v2>(
-+        connection, registry, name, kMinVersion);
-   } else {
-     NOTREACHED() << " unexpected interface name: " << interface;
-   }
-diff --git a/ui/ozone/platform/wayland/host/zwp_idle_inhibit_manager.cc b/ui/ozone/platform/wayland/host/zwp_idle_inhibit_manager.cc
-index 47121293acb..fc05de68778 100644
---- a/ui/ozone/platform/wayland/host/zwp_idle_inhibit_manager.cc
-+++ b/ui/ozone/platform/wayland/host/zwp_idle_inhibit_manager.cc
-@@ -12,7 +12,7 @@
- namespace ui {
- 
- namespace {
--constexpr uint32_t kMaxZwpIdleInhibitManagerVersion = 1;
-+constexpr uint32_t kMinVersion = 1;
- }
- 
- // static
-@@ -26,11 +26,13 @@ void ZwpIdleInhibitManager::Instantiate(WaylandConnection* connection,
-                                         uint32_t version) {
-   DCHECK_EQ(interface, kInterfaceName);
- 
--  if (connection->zwp_idle_inhibit_manager_)
-+  if (connection->zwp_idle_inhibit_manager_ ||
-+      !wl::CanBind(interface, version, kMinVersion, kMinVersion)) {
-     return;
-+  }
- 
--  auto manager = wl::Bind<zwp_idle_inhibit_manager_v1>(
--      registry, name, std::min(version, kMaxZwpIdleInhibitManagerVersion));
-+  auto manager =
-+      wl::Bind<zwp_idle_inhibit_manager_v1>(registry, name, kMinVersion);
-   if (!manager) {
-     LOG(ERROR) << "Failed to bind zwp_idle_inhibit_manager_v1";
-     return;
-diff --git a/ui/ozone/platform/wayland/host/zwp_primary_selection_device_manager.cc b/ui/ozone/platform/wayland/host/zwp_primary_selection_device_manager.cc
-index f6f9fd23c35..795a09c0565 100644
---- a/ui/ozone/platform/wayland/host/zwp_primary_selection_device_manager.cc
-+++ b/ui/ozone/platform/wayland/host/zwp_primary_selection_device_manager.cc
-@@ -16,7 +16,7 @@
- namespace ui {
- 
- namespace {
--constexpr uint32_t kMaxGtkPrimarySelectionDeviceManagerVersion = 1;
-+constexpr uint32_t kMinVersion = 1;
- }  // namespace
- 
- // static
-@@ -31,12 +31,13 @@ void ZwpPrimarySelectionDeviceManager::Instantiate(
-     uint32_t version) {
-   DCHECK_EQ(interface, kInterfaceName);
- 
--  if (connection->zwp_primary_selection_device_manager_)
-+  if (connection->zwp_primary_selection_device_manager_ ||
-+      !wl::CanBind(interface, version, kMinVersion, kMinVersion)) {
-     return;
-+  }
- 
-   auto manager = wl::Bind<zwp_primary_selection_device_manager_v1>(
--      registry, name,
--      std::min(version, kMaxGtkPrimarySelectionDeviceManagerVersion));
-+      registry, name, kMinVersion);
-   if (!manager) {
-     LOG(ERROR) << "Failed to bind zwp_primary_selection_device_manager_v1";
-     return;
-
-From cd9eae3117ccc930f0cfae6d24bba1d6d66d769c Mon Sep 17 00:00:00 2001
-From: Alexander Dunaev <adunaev@igalia.com>
-Date: Tue, 28 Dec 2021 14:02:05 +0000
-Subject: [PATCH 2/2] [linux/wayland] Fixed terminate caused by binding to
- wrong version.
-
-This is a fixup to [1] where a typo creeped in.
-
-[1] https://chromium-review.googlesource.com/c/chromium/src/+/3337037
-
-Bug: 1279574
-Change-Id: If8f1a308ce8d27b51a9cd4d52ad8eec2e29edf95
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3358254
-Reviewed-by: Antonio Gomes <tonikitoo@igalia.com>
-Commit-Queue: Alexander Dunaev <adunaev@igalia.com>
-Auto-Submit: Alexander Dunaev <adunaev@igalia.com>
-Cr-Commit-Position: refs/heads/main@{#954286}
-
-(cherry picked from commit a84b79daa8897b822336b8f348ef4daaae07af37)
----
- ui/ozone/platform/wayland/host/wayland_drm.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ui/ozone/platform/wayland/host/wayland_drm.cc b/ui/ozone/platform/wayland/host/wayland_drm.cc
-index a7ed2e20ffe..b10b79412e5 100644
---- a/ui/ozone/platform/wayland/host/wayland_drm.cc
-+++ b/ui/ozone/platform/wayland/host/wayland_drm.cc
-@@ -32,7 +32,7 @@ void WaylandDrm::Instantiate(WaylandConnection* connection,
-   DCHECK_EQ(interface, kInterfaceName);
- 
-   if (connection->drm_ ||
--      !!wl::CanBind(interface, version, kMinVersion, kMinVersion)) {
-+      !wl::CanBind(interface, version, kMinVersion, kMinVersion)) {
-     return;
-   }
- 

webcodecs-stop-using-AudioOpusEncoder.patch

@@ -0,0 +1,49 @@
+From 3bd46cb9a51773f103ef52b39d6407740eb0d60a Mon Sep 17 00:00:00 2001
+From: Eugene Zemtsov <eugene@chromium.org>
+Date: Thu, 24 Feb 2022 23:17:20 +0000
+Subject: [PATCH] webcodecs: Stop using AudioOpusEncoder as backed for mojo
+ audio encoder
+
+AudioOpusEncoder was only used here for testing. Let's not let it get
+comfortable. We'll use MF AAC encoder here when we have it. (Soon...)
+
+Bug: 1259883
+Change-Id: Ia1819395c8c8fd6d403d4b8558c12f9a1bf7e761
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3489449
+Commit-Queue: Eugene Zemtsov <eugene@chromium.org>
+Auto-Submit: Eugene Zemtsov <eugene@chromium.org>
+Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
+Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
+Cr-Commit-Position: refs/heads/main@{#974895}
+---
+ media/mojo/services/gpu_mojo_media_client.cc | 10 +---------
+ 1 file changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/media/mojo/services/gpu_mojo_media_client.cc b/media/mojo/services/gpu_mojo_media_client.cc
+index 8f83a4d6cf6..40cdaff8d3a 100644
+--- a/media/mojo/services/gpu_mojo_media_client.cc
++++ b/media/mojo/services/gpu_mojo_media_client.cc
+@@ -13,7 +13,6 @@
+ #include "build/chromeos_buildflags.h"
+ #include "gpu/ipc/service/gpu_channel.h"
+ #include "media/audio/audio_features.h"
+-#include "media/audio/audio_opus_encoder.h"
+ #include "media/base/audio_decoder.h"
+ #include "media/base/cdm_factory.h"
+ #include "media/base/media_switches.h"
+@@ -119,14 +118,7 @@ std::unique_ptr<AudioEncoder> GpuMojoMediaClient::CreateAudioEncoder(
+     scoped_refptr<base::SequencedTaskRunner> task_runner) {
+   if (!base::FeatureList::IsEnabled(features::kPlatformAudioEncoder))
+     return nullptr;
+-  // TODO(crbug.com/1259883) Right now Opus encoder is all we have, later on
+-  // we'll create a real platform encoder here.
+-  auto opus_encoder = std::make_unique<AudioOpusEncoder>();
+-  auto encoding_runner = base::ThreadPool::CreateSequencedTaskRunner(
+-      {base::TaskPriority::USER_BLOCKING});
+-  return std::make_unique<OffloadingAudioEncoder>(std::move(opus_encoder),
+-                                                  std::move(encoding_runner),
+-                                                  std::move(task_runner));
++  return nullptr;
+ }
+ 
+ VideoDecoderType GpuMojoMediaClient::GetDecoderImplementationType() {