[arch-commits] Commit in chromium/repos (6 files)
Evangelos Foutras
foutrelis at gemini.archlinux.org
Sun Jan 23 19:03:22 UTC 2022
Date: Sunday, January 23, 2022 @ 19:03:22
Author: foutrelis
Revision: 435005
archrelease: copy trunk to staging-x86_64
Added:
chromium/repos/staging-x86_64/
chromium/repos/staging-x86_64/PKGBUILD
(from rev 435004, chromium/trunk/PKGBUILD)
chromium/repos/staging-x86_64/sql-make-VirtualCursor-standard-layout-type.patch
(from rev 435004, chromium/trunk/sql-make-VirtualCursor-standard-layout-type.patch)
chromium/repos/staging-x86_64/unexpire-accelerated-video-decode-flag.patch
(from rev 435004, chromium/trunk/unexpire-accelerated-video-decode-flag.patch)
chromium/repos/staging-x86_64/use-oauth2-client-switches-as-default.patch
(from rev 435004, chromium/trunk/use-oauth2-client-switches-as-default.patch)
chromium/repos/staging-x86_64/wayland-fix-binding-to-wrong-version.patch
(from rev 435004, chromium/trunk/wayland-fix-binding-to-wrong-version.patch)
---------------------------------------------------+
PKGBUILD | 262 +++++++
sql-make-VirtualCursor-standard-layout-type.patch | 238 ++++++
unexpire-accelerated-video-decode-flag.patch | 11
use-oauth2-client-switches-as-default.patch | 17
wayland-fix-binding-to-wrong-version.patch | 683 ++++++++++++++++++++
5 files changed, 1211 insertions(+)
Copied: chromium/repos/staging-x86_64/PKGBUILD (from rev 435004, chromium/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2022-01-23 19:03:22 UTC (rev 435005)
@@ -0,0 +1,262 @@
+# Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+# Contributor: Jan "heftig" Steffens <jan.steffens at gmail.com>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=chromium
+pkgver=97.0.4692.99
+pkgrel=3
+_launcher_ver=8
+_gcc_patchset=4
+pkgdesc="A web browser built for speed, simplicity, and security"
+arch=('x86_64')
+url="https://www.chromium.org/Home"
+license=('BSD')
+depends=('gtk3' 'nss' 'alsa-lib' 'xdg-utils' 'libxss' 'libcups' 'libgcrypt'
+ 'ttf-liberation' 'systemd' 'dbus' 'libpulse' 'pciutils' 'libva'
+ 'desktop-file-utils' 'hicolor-icon-theme')
+makedepends=('python' 'gn' 'ninja' 'clang' 'lld' 'gperf' 'nodejs' 'pipewire'
+ 'java-runtime-headless')
+optdepends=('pipewire: WebRTC desktop sharing under Wayland'
+ 'kdialog: support for native dialogs in Plasma'
+ 'org.freedesktop.secrets: password storage backend on GNOME / Xfce'
+ 'kwallet: support for storing passwords in KWallet on Plasma')
+options=('!lto') # Chromium adds its own flags for ThinLTO
+source=(https://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$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
+ sql-make-VirtualCursor-standard-layout-type.patch
+ unexpire-accelerated-video-decode-flag.patch
+ use-oauth2-client-switches-as-default.patch)
+sha256sums=('c91bae205705b367f2cfc1f72ce1ee99b2ceb5edfc584e15c60a6ab5ff01ecba'
+ '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
+ '7af5c0a55a20c0fb496b2f4448d89203a83bb1914754d864460e55e68731ef0b'
+ '29541840921302060f712838ba460cd7e988148af3ce3c9dc45437fc78442a67'
+ 'dd317f85e5abfdcfc89c6f23f4c8edbcdebdd5e083dcec770e5da49ee647d150'
+ '2a97b26c3d6821b15ef4ef1369905c6fa3e9c8da4877eb9af4361452a425290b'
+ 'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711')
+
+# Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
+# Keys are the names in the above script; values are the dependencies in Arch
+declare -gA _system_libs=(
+ [ffmpeg]=ffmpeg
+ [flac]=flac
+ [fontconfig]=fontconfig
+ [freetype]=freetype2
+ [harfbuzz-ng]=harfbuzz
+ [icu]=icu
+ [libdrm]=
+ [libjpeg]=libjpeg
+ [libpng]=libpng
+ #[libvpx]=libvpx
+ [libwebp]=libwebp
+ [libxml]=libxml2
+ [libxslt]=libxslt
+ [opus]=opus
+ [re2]=re2
+ [snappy]=snappy
+ [zlib]=minizip
+)
+_unwanted_bundled_libs=(
+ $(printf "%s\n" ${!_system_libs[@]} | sed 's/^libjpeg$/&_turbo/')
+)
+depends+=(${_system_libs[@]})
+
+# Google API keys (see https://www.chromium.org/developers/how-tos/api-keys)
+# Note: These are for Arch Linux use ONLY. For your own distribution, please
+# get your own set of keys.
+#
+# Starting with Chromium 89 (2021-03-02) the OAuth2 credentials have been left
+# out: https://archlinux.org/news/chromium-losing-sync-support-in-early-march/
+_google_api_key=AIzaSyDwr302FpOSkGRpLlUpPThNTDPbXcIn_FM
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # Allow building against system libraries in official builds
+ sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
+ tools/generate_shim_headers/generate_shim_headers.py
+
+ # https://crbug.com/893950
+ sed -i -e 's/\<xmlMalloc\>/malloc/' -e 's/\<xmlFree\>/free/' \
+ third_party/blink/renderer/core/xml/*.cc \
+ third_party/blink/renderer/core/xml/parser/xml_document_parser.cc \
+ third_party/libxml/chromium/*.cc \
+ third_party/maldoca/src/maldoca/ole/oss_utils.h
+
+ # Use the --oauth2-client-id= and --oauth2-client-secret= switches for
+ # setting GOOGLE_DEFAULT_CLIENT_ID and GOOGLE_DEFAULT_CLIENT_SECRET at
+ # runtime -- this allows signing into Chromium without baked-in values
+ patch -Np1 -i ../use-oauth2-client-switches-as-default.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/
+
+ # Link to system tools required by the build
+ mkdir -p third_party/node/linux/node-linux-x64/bin
+ ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/
+ ln -s /usr/bin/java third_party/jdk/current/bin/
+
+ # Remove bundled libraries for which we will use the system copies; this
+ # *should* do what the remove_bundled_libraries.py script does, with the
+ # added benefit of not having to list all the remaining libraries
+ local _lib
+ for _lib in ${_unwanted_bundled_libs[@]}; do
+ find "third_party/$_lib" -type f \
+ \! -path "third_party/$_lib/chromium/*" \
+ \! -path "third_party/$_lib/google/*" \
+ \! -path "third_party/harfbuzz-ng/utils/hb_scoped.h" \
+ \! -regex '.*\.\(gn\|gni\|isolate\)' \
+ -delete
+ done
+
+ ./build/linux/unbundle/replace_gn_files.py \
+ --system-libraries "${!_system_libs[@]}"
+}
+
+build() {
+ make -C chromium-launcher-$_launcher_ver
+
+ cd "$srcdir/$pkgname-$pkgver"
+
+ export CC=clang
+ export CXX=clang++
+ export AR=ar
+ export NM=nm
+
+ local _flags=(
+ 'custom_toolchain="//build/toolchain/linux/unbundle:default"'
+ 'host_toolchain="//build/toolchain/linux/unbundle:default"'
+ 'clang_use_chrome_plugins=false'
+ 'is_official_build=true' # implies is_cfi=true on x86_64
+ 'treat_warnings_as_errors=false'
+ 'disable_fieldtrial_testing_config=true'
+ 'blink_enable_generated_code_formatting=false'
+ 'ffmpeg_branding="Chrome"'
+ 'proprietary_codecs=true'
+ 'rtc_use_pipewire=true'
+ 'link_pulseaudio=true'
+ 'use_gnome_keyring=false'
+ 'use_sysroot=false'
+ 'use_custom_libcxx=false'
+ 'enable_hangout_services_extension=true'
+ 'enable_widevine=true'
+ 'enable_nacl=false'
+ "google_api_key=\"$_google_api_key\""
+ )
+
+ if [[ -n ${_system_libs[icu]+set} ]]; then
+ _flags+=('icu_use_data_file=false')
+ fi
+
+ if check_option strip y; then
+ _flags+=('symbol_level=0')
+ fi
+
+ # Facilitate deterministic builds (taken from build/config/compiler/BUILD.gn)
+ CFLAGS+=' -Wno-builtin-macro-redefined'
+ CXXFLAGS+=' -Wno-builtin-macro-redefined'
+ CPPFLAGS+=' -D__DATE__= -D__TIME__= -D__TIMESTAMP__='
+
+ # Do not warn about unknown warning options
+ CFLAGS+=' -Wno-unknown-warning-option'
+ CXXFLAGS+=' -Wno-unknown-warning-option'
+
+ # 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
+ CFLAGS=${CFLAGS/-fstack-clash-protection}
+ CXXFLAGS=${CXXFLAGS/-fstack-clash-protection}
+
+ # https://crbug.com/957519#c122
+ CXXFLAGS=${CXXFLAGS/-Wp,-D_GLIBCXX_ASSERTIONS}
+
+ gn gen out/Release --args="${_flags[*]}"
+ ninja -C out/Release chrome chrome_sandbox chromedriver
+}
+
+package() {
+ cd chromium-launcher-$_launcher_ver
+ make PREFIX=/usr DESTDIR="$pkgdir" install
+ install -Dm644 LICENSE \
+ "$pkgdir/usr/share/licenses/chromium/LICENSE.launcher"
+
+ cd "$srcdir/$pkgname-$pkgver"
+
+ install -D out/Release/chrome "$pkgdir/usr/lib/chromium/chromium"
+ install -Dm4755 out/Release/chrome_sandbox "$pkgdir/usr/lib/chromium/chrome-sandbox"
+ ln -s /usr/lib/chromium/chromedriver "$pkgdir/usr/bin/chromedriver"
+
+ install -Dm644 chrome/installer/linux/common/desktop.template \
+ "$pkgdir/usr/share/applications/chromium.desktop"
+ install -Dm644 chrome/app/resources/manpage.1.in \
+ "$pkgdir/usr/share/man/man1/chromium.1"
+ sed -i \
+ -e 's/@@MENUNAME@@/Chromium/g' \
+ -e 's/@@PACKAGE@@/chromium/g' \
+ -e 's/@@USR_BIN_SYMLINK_NAME@@/chromium/g' \
+ "$pkgdir/usr/share/applications/chromium.desktop" \
+ "$pkgdir/usr/share/man/man1/chromium.1"
+
+ install -Dm644 chrome/installer/linux/common/chromium-browser/chromium-browser.appdata.xml \
+ "$pkgdir/usr/share/metainfo/chromium.appdata.xml"
+ sed -ni \
+ -e 's/chromium-browser\.desktop/chromium.desktop/' \
+ -e '/<update_contact>/d' \
+ -e '/<p>/N;/<p>\n.*\(We invite\|Chromium supports Vorbis\)/,/<\/p>/d' \
+ -e '/^<?xml/,$p' \
+ "$pkgdir/usr/share/metainfo/chromium.appdata.xml"
+
+ local toplevel_files=(
+ chrome_100_percent.pak
+ chrome_200_percent.pak
+ chrome_crashpad_handler
+ chromedriver
+ resources.pak
+ v8_context_snapshot.bin
+
+ # ANGLE
+ libEGL.so
+ libGLESv2.so
+
+ # SwiftShader ICD
+ libvk_swiftshader.so
+ vk_swiftshader_icd.json
+ )
+
+ if [[ -z ${_system_libs[icu]+set} ]]; then
+ toplevel_files+=(icudtl.dat)
+ fi
+
+ cp "${toplevel_files[@]/#/out/Release/}" "$pkgdir/usr/lib/chromium/"
+ install -Dm644 -t "$pkgdir/usr/lib/chromium/locales" out/Release/locales/*.pak
+ install -Dm755 -t "$pkgdir/usr/lib/chromium/swiftshader" out/Release/swiftshader/*.so
+
+ for size in 24 48 64 128 256; do
+ install -Dm644 "chrome/app/theme/chromium/product_logo_$size.png" \
+ "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"
+ done
+
+ for size in 16 32; do
+ install -Dm644 "chrome/app/theme/default_100_percent/chromium/product_logo_$size.png" \
+ "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png"
+ done
+
+ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/chromium/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
Copied: chromium/repos/staging-x86_64/sql-make-VirtualCursor-standard-layout-type.patch (from rev 435004, chromium/trunk/sql-make-VirtualCursor-standard-layout-type.patch)
===================================================================
--- staging-x86_64/sql-make-VirtualCursor-standard-layout-type.patch (rev 0)
+++ staging-x86_64/sql-make-VirtualCursor-standard-layout-type.patch 2022-01-23 19:03:22 UTC (rev 435005)
@@ -0,0 +1,238 @@
+From 80368f8ba7a8bab13440463a254888311efe3986 Mon Sep 17 00:00:00 2001
+From: Stephan Hartmann <stha09 at 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(-)
+
+diff --git a/sql/recover_module/btree.cc b/sql/recover_module/btree.cc
+index 9ecaafe8a3..839318abf9 100644
+--- a/sql/recover_module/btree.cc
++++ b/sql/recover_module/btree.cc
+@@ -135,16 +135,25 @@ static_assert(std::is_trivially_destructible<LeafPageDecoder>::value,
+ "Move the destructor to the .cc file if it's non-trival");
+ #endif // !DCHECK_IS_ON()
+
+-LeafPageDecoder::LeafPageDecoder(DatabasePageReader* db_reader) noexcept
+- : page_id_(db_reader->page_id()),
+- db_reader_(db_reader),
+- cell_count_(ComputeCellCount(db_reader)),
+- next_read_index_(0),
+- last_record_size_(0) {
++void LeafPageDecoder::Initialize(DatabasePageReader* db_reader) {
++ DCHECK(db_reader);
+ DCHECK(IsOnValidPage(db_reader));
++ page_id_ = db_reader->page_id();
++ db_reader_ = db_reader;
++ cell_count_ = ComputeCellCount(db_reader);
++ next_read_index_ = 0;
++ last_record_size_ = 0;
+ DCHECK(DatabasePageReader::IsValidPageId(page_id_));
+ }
+
++void LeafPageDecoder::Reset() {
++ db_reader_ = nullptr;
++ page_id_ = 0;
++ cell_count_ = 0;
++ next_read_index_ = 0;
++ last_record_size_ = 0;
++}
++
+ bool LeafPageDecoder::TryAdvance() {
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+ DCHECK(CanAdvance());
+diff --git a/sql/recover_module/btree.h b/sql/recover_module/btree.h
+index d76d076bf6..33114b01fa 100644
+--- a/sql/recover_module/btree.h
++++ b/sql/recover_module/btree.h
+@@ -102,7 +102,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;
+@@ -150,6 +150,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.
+@@ -163,14 +172,14 @@ class LeafPageDecoder {
+ static int ComputeCellCount(DatabasePageReader* db_reader);
+
+ // The number of the B-tree page this reader is reading.
+- const int64_t page_id_;
++ int64_t page_id_;
+ // Used to read the tree page.
+ //
+ // Raw pointer usage is acceptable because this instance's owner is expected
+ // to ensure that the DatabasePageReader outlives this.
+- DatabasePageReader* const db_reader_;
++ DatabasePageReader* db_reader_;
+ // Caches the ComputeCellCount() value for this reader's page.
+- const int cell_count_ = ComputeCellCount(db_reader_);
++ int cell_count_;
+
+ // The reader's cursor state.
+ //
+diff --git a/sql/recover_module/cursor.cc b/sql/recover_module/cursor.cc
+index 0029ff9295..42548bc4b5 100644
+--- a/sql/recover_module/cursor.cc
++++ b/sql/recover_module/cursor.cc
+@@ -26,7 +26,7 @@ VirtualCursor::~VirtualCursor() {
+ int VirtualCursor::First() {
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+ inner_decoders_.clear();
+- leaf_decoder_ = nullptr;
++ leaf_decoder_.Reset();
+
+ AppendPageDecoder(table_->root_page_id());
+ return Next();
+@@ -36,18 +36,18 @@ 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())
+@@ -99,13 +99,13 @@ int VirtualCursor::ReadColumn(int column_index,
+ int64_t VirtualCursor::RowId() {
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+ DCHECK(record_reader_.IsInitialized());
+- DCHECK(leaf_decoder_.get());
+- return leaf_decoder_->last_record_rowid();
++ DCHECK(leaf_decoder_.IsValid());
++ return leaf_decoder_.last_record_rowid();
+ }
+
+ void VirtualCursor::AppendPageDecoder(int page_id) {
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+- DCHECK(leaf_decoder_.get() == nullptr)
++ DCHECK(!leaf_decoder_.IsValid())
+ << __func__
+ << " must only be called when the current path has no leaf decoder";
+
+@@ -113,7 +113,7 @@ void VirtualCursor::AppendPageDecoder(int page_id) {
+ 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 afcd6900e1..b15c31d425 100644
+--- a/sql/recover_module/cursor.h
++++ b/sql/recover_module/cursor.h
+@@ -129,7 +129,7 @@ class VirtualCursor {
+ std::vector<std::unique_ptr<InnerPageDecoder>> inner_decoders_;
+
+ // Decodes the leaf page containing records.
+- std::unique_ptr<LeafPageDecoder> leaf_decoder_;
++ LeafPageDecoder leaf_decoder_;
+
+ SEQUENCE_CHECKER(sequence_checker_);
+ };
+diff --git a/sql/recover_module/pager.cc b/sql/recover_module/pager.cc
+index 58e75de270..5fe96204e5 100644
+--- a/sql/recover_module/pager.cc
++++ b/sql/recover_module/pager.cc
+@@ -23,8 +23,7 @@ static_assert(DatabasePageReader::kMaxPageId <= std::numeric_limits<int>::max(),
+ "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 page_id) {
+ std::numeric_limits<int64_t>::max(),
+ "The |read_offset| computation above may overflow");
+
+- int sqlite_status =
+- RawRead(sqlite_file, read_size, read_offset, page_data_.get());
++ int sqlite_status = RawRead(sqlite_file, read_size, read_offset,
++ const_cast<uint8_t*>(page_data_.data()));
+
+ // |page_id_| needs to be set to kInvalidPageId if the read failed.
+ // Otherwise, future ReadPage() calls with the previous |page_id_| value
+diff --git a/sql/recover_module/pager.h b/sql/recover_module/pager.h
+index 0e388ddc3b..99314e30ff 100644
+--- a/sql/recover_module/pager.h
++++ b/sql/recover_module/pager.h
+@@ -5,6 +5,7 @@
+ #ifndef SQL_RECOVER_MODULE_PAGER_H_
+ #define SQL_RECOVER_MODULE_PAGER_H_
+
++#include <array>
+ #include <cstdint>
+ #include <memory>
+
+@@ -70,7 +71,7 @@ class DatabasePageReader {
+ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
+ DCHECK_NE(page_id_, kInvalidPageId)
+ << "Successful ReadPage() required before accessing pager state";
+- return page_data_.get();
++ return page_data_.data();
+ }
+
+ // The number of bytes in the page read by the last ReadPage() call.
+@@ -137,7 +138,7 @@ class DatabasePageReader {
+ int page_id_ = kInvalidPageId;
+ // Stores the bytes of the last page successfully read by ReadPage().
+ // The content is undefined if the last call to ReadPage() did not succeed.
+- const std::unique_ptr<uint8_t[]> page_data_;
++ const std::array<uint8_t, kMaxPageSize> page_data_;
+ // Raw pointer usage is acceptable because this instance's owner is expected
+ // to ensure that the VirtualTable outlives this.
+ VirtualTable* const table_;
Copied: chromium/repos/staging-x86_64/unexpire-accelerated-video-decode-flag.patch (from rev 435004, chromium/trunk/unexpire-accelerated-video-decode-flag.patch)
===================================================================
--- staging-x86_64/unexpire-accelerated-video-decode-flag.patch (rev 0)
+++ staging-x86_64/unexpire-accelerated-video-decode-flag.patch 2022-01-23 19:03:22 UTC (rev 435005)
@@ -0,0 +1,11 @@
+--- chrome/browser/flag-metadata.json.orig 2021-09-21 18:34:38.740426608 +0000
++++ chrome/browser/flag-metadata.json 2021-09-21 18:35:09.392000797 +0000
+@@ -1285,7 +1285,7 @@
+ {
+ "name": "enable-accelerated-video-decode",
+ "owners": [ "media-dev at chromium.org" ],
+- "expiry_milestone": 93
++ "expiry_milestone": 99
+ },
+ {
+ "name": "enable-accessibility-live-caption",
Copied: chromium/repos/staging-x86_64/use-oauth2-client-switches-as-default.patch (from rev 435004, chromium/trunk/use-oauth2-client-switches-as-default.patch)
===================================================================
--- staging-x86_64/use-oauth2-client-switches-as-default.patch (rev 0)
+++ staging-x86_64/use-oauth2-client-switches-as-default.patch 2022-01-23 19:03:22 UTC (rev 435005)
@@ -0,0 +1,17 @@
+diff -upr chromium-89.0.4389.58.orig/google_apis/google_api_keys.cc chromium-89.0.4389.58/google_apis/google_api_keys.cc
+--- chromium-89.0.4389.58.orig/google_apis/google_api_keys.cc 2021-02-24 22:37:18.494007649 +0000
++++ chromium-89.0.4389.58/google_apis/google_api_keys.cc 2021-02-24 22:35:00.865777600 +0000
+@@ -154,11 +154,11 @@ class APIKeyCache {
+
+ std::string default_client_id = CalculateKeyValue(
+ GOOGLE_DEFAULT_CLIENT_ID,
+- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), nullptr,
++ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), ::switches::kOAuth2ClientID,
+ std::string(), environment.get(), command_line, gaia_config);
+ std::string default_client_secret = CalculateKeyValue(
+ GOOGLE_DEFAULT_CLIENT_SECRET,
+- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), nullptr,
++ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), ::switches::kOAuth2ClientSecret,
+ std::string(), environment.get(), command_line, gaia_config);
+
+ // We currently only allow overriding the baked-in values for the
Copied: chromium/repos/staging-x86_64/wayland-fix-binding-to-wrong-version.patch (from rev 435004, chromium/trunk/wayland-fix-binding-to-wrong-version.patch)
===================================================================
--- staging-x86_64/wayland-fix-binding-to-wrong-version.patch (rev 0)
+++ staging-x86_64/wayland-fix-binding-to-wrong-version.patch 2022-01-23 19:03:22 UTC (rev 435005)
@@ -0,0 +1,683 @@
+From 5e3ed3d015d0ddae5e4d813204616d89d2f859c7 Mon Sep 17 00:00:00 2001
+From: Alexander Dunaev <adunaev at 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 at igalia.com>
+Commit-Queue: Alexander Dunaev <adunaev at 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 at 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 at igalia.com>
+Commit-Queue: Alexander Dunaev <adunaev at igalia.com>
+Auto-Submit: Alexander Dunaev <adunaev at 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;
+ }
+
More information about the arch-commits
mailing list