Date: Thursday, January 27, 2022 @ 19:07:23 Author: foutrelis Revision: 1117338
archrelease: copy trunk to community-x86_64 Added: electron/repos/community-x86_64/PKGBUILD (from rev 1117337, electron/trunk/PKGBUILD) electron/repos/community-x86_64/chromium-93-ffmpeg-4.4.patch (from rev 1117337, electron/trunk/chromium-93-ffmpeg-4.4.patch) electron/repos/community-x86_64/chromium-94-ffmpeg-roll.patch (from rev 1117337, electron/trunk/chromium-94-ffmpeg-roll.patch) electron/repos/community-x86_64/default_app-icon.patch (from rev 1117337, electron/trunk/default_app-icon.patch) electron/repos/community-x86_64/electron-launcher.sh (from rev 1117337, electron/trunk/electron-launcher.sh) electron/repos/community-x86_64/electron.desktop (from rev 1117337, electron/trunk/electron.desktop) electron/repos/community-x86_64/jinja-python-3.10.patch (from rev 1117337, electron/trunk/jinja-python-3.10.patch) electron/repos/community-x86_64/sql-make-VirtualCursor-standard-layout-type.patch (from rev 1117337, electron/trunk/sql-make-VirtualCursor-standard-layout-type.patch) electron/repos/community-x86_64/std-vector-non-const.patch (from rev 1117337, electron/trunk/std-vector-non-const.patch) electron/repos/community-x86_64/unbundle-fix-visibility-of-build-config-freetype.patch (from rev 1117337, electron/trunk/unbundle-fix-visibility-of-build-config-freetype.patch) electron/repos/community-x86_64/unexpire-accelerated-video-decode-flag.patch (from rev 1117337, electron/trunk/unexpire-accelerated-video-decode-flag.patch) electron/repos/community-x86_64/use-system-libraries-in-node.patch (from rev 1117337, electron/trunk/use-system-libraries-in-node.patch) electron/repos/community-x86_64/wayland-fix-binding-to-wrong-version.patch (from rev 1117337, electron/trunk/wayland-fix-binding-to-wrong-version.patch) Deleted: electron/repos/community-x86_64/PKGBUILD electron/repos/community-x86_64/chromium-93-ffmpeg-4.4.patch electron/repos/community-x86_64/chromium-94-ffmpeg-roll.patch electron/repos/community-x86_64/default_app-icon.patch electron/repos/community-x86_64/electron-launcher.sh electron/repos/community-x86_64/electron.desktop electron/repos/community-x86_64/jinja-python-3.10.patch electron/repos/community-x86_64/sql-make-VirtualCursor-standard-layout-type.patch electron/repos/community-x86_64/std-vector-non-const.patch electron/repos/community-x86_64/unbundle-fix-visibility-of-build-config-freetype.patch electron/repos/community-x86_64/unexpire-accelerated-video-decode-flag.patch electron/repos/community-x86_64/use-system-libraries-in-node.patch electron/repos/community-x86_64/wayland-fix-binding-to-wrong-version.patch --------------------------------------------------------+ PKGBUILD | 552 +++--- chromium-93-ffmpeg-4.4.patch | 72 chromium-94-ffmpeg-roll.patch | 98 - default_app-icon.patch | 42 electron-launcher.sh | 40 electron.desktop | 14 jinja-python-3.10.patch | 66 sql-make-VirtualCursor-standard-layout-type.patch | 476 ++--- std-vector-non-const.patch | 230 +- unbundle-fix-visibility-of-build-config-freetype.patch | 62 unexpire-accelerated-video-decode-flag.patch | 22 use-system-libraries-in-node.patch | 106 - wayland-fix-binding-to-wrong-version.patch | 1302 +++++++-------- 13 files changed, 1543 insertions(+), 1539 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-01-27 19:07:10 UTC (rev 1117337) +++ PKGBUILD 2022-01-27 19:07:23 UTC (rev 1117338) @@ -1,274 +0,0 @@ -# Maintainer: Nicola Squartini <tens...@gmail.com> - -_use_suffix=0 -pkgver=16.0.7 -_commit=86cf473d814fabf6e364bc7df387c45dde3a1484 -_chromiumver=96.0.4664.110 -_gcc_patchset=4 -# shellcheck disable=SC2034 -pkgrel=2 - -_major_ver=${pkgver%%.*} -if [[ ${_use_suffix} != 0 ]]; then - pkgname="electron${_major_ver}" -else - pkgname=electron -fi -# shellcheck disable=SC2034 -pkgdesc='Build cross platform desktop apps with web technologies' -# shellcheck disable=SC2034 -arch=('x86_64') -# shellcheck disable=SC2034 -url='https://electronjs.org/' -# shellcheck disable=SC2034 -license=('MIT' 'custom') -# shellcheck disable=SC2034 -depends=('c-ares' 'ffmpeg' 'gtk3' 'libevent' 'libxslt' 'minizip' 'nss' 're2' - 'snappy') -# shellcheck disable=SC2034 -makedepends=('clang' 'git' 'gn' 'gperf' 'harfbuzz-icu' 'http-parser' - 'java-runtime-headless' 'jsoncpp' 'libnotify' 'lld' 'llvm' 'ninja' - 'npm' 'pciutils' 'pipewire' 'python' 'wget' 'yarn') -# shellcheck disable=SC2034 -optdepends=('kde-cli-tools: file deletion support (kioclient5)' - 'libappindicator-gtk3: StatusNotifierItem support' - 'pipewire: WebRTC desktop sharing under Wayland' - 'trash-cli: file deletion support (trash-put)' - "xdg-utils: open URLs with desktop's default (xdg-email, xdg-open)") -if [[ ${_use_suffix} == 0 ]]; then - # shellcheck disable=SC2034 - conflicts=("electron${_major_ver}") - # shellcheck disable=SC2034 - provides=("electron${_major_ver}") -fi -# shellcheck disable=SC2034 -options=('!lto') # Electron adds its own flags for ThinLTO -# shellcheck disable=SC2034 -source=('git+https://github.com/electron/electron.git' - 'git+https://chromium.googlesource.com/chromium/tools/depot_tools.git#branch=main' - "https://github.com/stha09/chromium-patches/releases/download/chromium-${_chromiumver%%.*}-patchset-${_gcc_patchset}/chromium-${_chromiumver%%.*}-patchset-${_gcc_patchset}.tar.xz" - "electron-launcher.sh" - "electron.desktop" - 'default_app-icon.patch' - 'jinja-python-3.10.patch' - 'std-vector-non-const.patch' - 'use-system-libraries-in-node.patch' - 'sql-make-VirtualCursor-standard-layout-type.patch' - 'wayland-fix-binding-to-wrong-version.patch' - 'unbundle-fix-visibility-of-build-config-freetype.patch' - 'chromium-93-ffmpeg-4.4.patch' - 'chromium-94-ffmpeg-roll.patch' - 'unexpire-accelerated-video-decode-flag.patch' - ) -# shellcheck disable=SC2034 -sha256sums=('SKIP' - 'SKIP' - '090af7eab39aade15a1786273f2497d6b4abfaef24279fbf97ce0dd1c38c69aa' - '3953f532a3ea5fce19ee33600c6ead89dcd066df6a01d3c3ab4c24f96e46fca2' - '4484200d90b76830b69eea3a471c103999a3ce86bb2c29e6c14c945bf4102bae' - '75bac9c4ad32ff9329399b8587f9772e208c009fd822cdfce61b2bd1ee9ac828' - '09de0ebb4002be7fb4ede63d3977e4f1235637750169c9e71bfdbd75bf750f7a' - '05598c7ccac38772503f00335916fe038db0d9aa240cf13a3b0f0ee69a382d98' - 'c70652a8b24c237bcfd27469de32797a2cb46d9f0d63d897bb6418314a25644c' - 'dd317f85e5abfdcfc89c6f23f4c8edbcdebdd5e083dcec770e5da49ee647d150' - 'fc2be146412d117869368f8559afef76ad39a3442ace16e5c7000bd45aa56b27' - 'd0b17162211dd49e3a58c16d1697e7d8c322dcfd3b7890f0c2f920b711f52293' - '1a9e074f417f8ffd78bcd6874d8e2e74a239905bf662f76a7755fa40dc476b57' - '56acb6e743d2ab1ed9f3eb01700ade02521769978d03ac43226dec94659b3ace' - '2a97b26c3d6821b15ef4ef1369905c6fa3e9c8da4877eb9af4361452a425290b' - ) - -_system_libs=('ffmpeg' - 'flac' - 'fontconfig' - 'freetype' - 'harfbuzz-ng' - 'icu' - 'libdrm' - 'libevent' - 'libjpeg' - 'libpng' -# 'libvpx' - 'libwebp' - 'libxml' - 'libxslt' -# 'openh264' - 'opus' - 're2' - 'snappy' - 'zlib' - ) - -prepare() { - sed -i "s|@ELECTRON@|${pkgname}|" electron-launcher.sh - sed -i "s|@ELECTRON@|${pkgname}|" electron.desktop - if [[ ${_use_suffix} != 0 ]]; then - sed -i "s|@ELECTRON_NAME@|Electron ${_major_ver}|" electron.desktop - else - sed -i "s|@ELECTRON_NAME@|Electron|" electron.desktop - fi - - export PATH="${PATH}:${srcdir:?}/depot_tools" - - echo "Fetching chromium..." - git clone --branch=${_chromiumver} --depth=1 \ - https://chromium.googlesource.com/chromium/src.git - - echo "solutions = [ - { - \"name\": \"src/electron\", - \"url\": \"file://${srcdir}/electron@${_commit}\", - \"deps_file\": \"DEPS\", - \"managed\": False, - \"custom_deps\": { - \"src\": None, - }, - \"custom_vars\": {}, - }, -]" > .gclient - - python "${srcdir}/depot_tools/gclient.py" sync \ - --with_branch_heads \ - --with_tags \ - --nohooks - - ( - cd src/electron || exit - patch -Np1 -i ../../std-vector-non-const.patch - ) - - echo "Running hooks..." - # python "${srcdir}/depot_tools/gclient.py" runhooks - src/build/landmines.py - src/build/util/lastchange.py -o src/build/util/LASTCHANGE - src/build/util/lastchange.py -m GPU_LISTS_VERSION \ - --revision-id-only --header src/gpu/config/gpu_lists_version.h - src/build/util/lastchange.py -m SKIA_COMMIT_HASH \ - -s src/third_party/skia --header src/skia/ext/skia_commit_hash.h - # Create sysmlink to system clang-format - ln -s /usr/bin/clang-format src/buildtools/linux64 - # Create sysmlink to system Node.js - mkdir -p src/third_party/node/linux/node-linux-x64/bin - ln -sf /usr/bin/node src/third_party/node/linux/node-linux-x64/bin - src/third_party/depot_tools/download_from_google_storage.py \ - --no_resume --extract --no_auth --bucket chromium-nodejs \ - -s src/third_party/node/node_modules.tar.gz.sha1 - vpython src/tools/download_optimization_profile.py \ - --newest_state=src/chrome/android/profiles/newest.txt \ - --local_state=src/chrome/android/profiles/local.txt \ - --output_name=src/chrome/android/profiles/afdo.prof \ - --gs_url_base=chromeos-prebuilt/afdo-job/llvm - #vpython src/tools/update_pgo_profiles.py \ - # --target=linux \ - # update \ - # --gs-url-base=chromium-optimization-profiles/pgo_profiles - src/electron/script/apply_all_patches.py \ - src/electron/patches/config.json - cd src/electron || exit - yarn install --frozen-lockfile - cd .. - - echo "Applying local patches..." - # Fixes for building with libstdc++ instead of libc++ - patch -Np1 -i ../patches/chromium-96-CommandLine-include.patch - patch -Np1 -i ../patches/chromium-96-RestrictedCookieManager-tuple.patch - patch -Np1 -i ../patches/chromium-96-DrmRenderNodePathFinder-include.patch - patch -Np1 -i ../patches/chromium-96-CouponDB-include.patch - - patch -Np1 -i ../unbundle-fix-visibility-of-build-config-freetype.patch - patch -Np1 -i ../chromium-93-ffmpeg-4.4.patch - patch -Rp1 -i ../chromium-94-ffmpeg-roll.patch - patch -Np1 -i ../sql-make-VirtualCursor-standard-layout-type.patch - patch -Np1 -i ../wayland-fix-binding-to-wrong-version.patch - patch -Np0 -i ../unexpire-accelerated-video-decode-flag.patch - patch -d third_party/electron_node/tools/inspector_protocol/jinja2 \ - -Np1 -i ../../../../../../jinja-python-3.10.patch - patch -Np1 -i ../use-system-libraries-in-node.patch - patch -Np1 -i ../default_app-icon.patch # Icon from .desktop file - - echo "Patching Chromium for using system libraries..." - sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \ - tools/generate_shim_headers/generate_shim_headers.py - for lib in $(printf "%s\n" "${_system_libs[@]}" | sed 's/^libjpeg$/&_turbo/'); do - third_party_dir="third_party/${lib}" - if [ ! -d "${third_party_dir}" ]; then - third_party_dir="base/${third_party_dir}" - fi - find "${third_party_dir}" -type f \ - \! -path "${third_party_dir}/chromium/*" \ - \! -path "${third_party_dir}/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() { - export CC=clang - export CXX=clang++ - export AR=ar - export NM=nm - - CFLAGS="${CFLAGS/-fexceptions/}" - CXXFLAGS="${CXXFLAGS/-fexceptions/}" - - # Do not warn about unknown warning options - CFLAGS+=' -Wno-unknown-warning-option' - CXXFLAGS+=' -Wno-unknown-warning-option' - - cd src || exit - export CHROMIUM_BUILDTOOLS_PATH="${PWD}/buildtools" - GN_EXTRA_ARGS=' - blink_symbol_level = 0 - chrome_pgo_phase = 0 - clang_use_chrome_plugins = false - custom_toolchain = "//build/toolchain/linux/unbundle:default" - host_toolchain = "//build/toolchain/linux/unbundle:default" - icu_use_data_file = false - is_component_ffmpeg = false - link_pulseaudio = true - rtc_use_pipewire = true - treat_warnings_as_errors = false - use_custom_libcxx = false - use_gnome_keyring = false - use_sysroot = false - ' - gn gen out/Release \ - --args="import(\"//electron/build/args/release.gn\") ${GN_EXTRA_ARGS}" - ninja -C out/Release electron - # Strip before zip to avoid - # zipfile.LargeZipFile: Filesize would require ZIP64 extensions - strip -s out/Release/electron - ninja -C out/Release electron_dist_zip - # ninja -C out/Release third_party/electron_node:headers -} - -package() { - install -dm755 "${pkgdir:?}/usr/lib/${pkgname}" - bsdtar -xf src/out/Release/dist.zip -C "${pkgdir}/usr/lib/${pkgname}" - - chmod u+s "${pkgdir}/usr/lib/${pkgname}/chrome-sandbox" - - install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}" - for l in "${pkgdir}/usr/lib/${pkgname}"/{LICENSE,LICENSES.chromium.html}; do - ln -s \ - "$(realpath --relative-to="${pkgdir}/usr/share/licenses/${pkgname}" "${l}")" \ - "${pkgdir}/usr/share/licenses/${pkgname}" - done - - install -Dm755 "${srcdir}/electron-launcher.sh" \ - "${pkgdir}/usr/bin/${pkgname}" - if [[ "${_use_suffix}" == 0 ]]; then - ln "${pkgdir}/usr/bin/${pkgname}" \ - "${pkgdir}/usr/bin/${pkgname}${_major_ver}" - fi - - # Install .desktop and icon file (see default_app-icon.patch) - install -Dm644 electron.desktop \ - "${pkgdir}/usr/share/applications/${pkgname}.desktop" - install -Dm644 src/electron/default_app/icon.png \ - "${pkgdir}/usr/share/pixmaps/${pkgname}.png" # hicolor has no 1024x1024 -} Copied: electron/repos/community-x86_64/PKGBUILD (from rev 1117337, electron/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-01-27 19:07:23 UTC (rev 1117338) @@ -0,0 +1,278 @@ +# Maintainer: Nicola Squartini <tens...@gmail.com> + +_use_suffix=0 +pkgver=16.0.7 +_commit=86cf473d814fabf6e364bc7df387c45dde3a1484 +_chromiumver=96.0.4664.110 +_gcc_patchset=4 +# shellcheck disable=SC2034 +pkgrel=3 + +_major_ver=${pkgver%%.*} +if [[ ${_use_suffix} != 0 ]]; then + pkgname="electron${_major_ver}" +else + pkgname=electron +fi +# shellcheck disable=SC2034 +pkgdesc='Build cross platform desktop apps with web technologies' +# shellcheck disable=SC2034 +arch=('x86_64') +# shellcheck disable=SC2034 +url='https://electronjs.org/' +# shellcheck disable=SC2034 +license=('MIT' 'custom') +# shellcheck disable=SC2034 +depends=('c-ares' 'ffmpeg' 'gtk3' 'libevent' 'libxslt' 'minizip' 'nss' 're2' + 'snappy') +# shellcheck disable=SC2034 +makedepends=('clang' 'git' 'gn' 'gperf' 'harfbuzz-icu' 'http-parser' + 'java-runtime-headless' 'jsoncpp' 'libnotify' 'lld' 'llvm' 'ninja' + 'npm' 'pciutils' 'pipewire' 'python' 'wget' 'yarn') +# shellcheck disable=SC2034 +optdepends=('kde-cli-tools: file deletion support (kioclient5)' + 'libappindicator-gtk3: StatusNotifierItem support' + 'pipewire: WebRTC desktop sharing under Wayland' + 'trash-cli: file deletion support (trash-put)' + "xdg-utils: open URLs with desktop's default (xdg-email, xdg-open)") +if [[ ${_use_suffix} == 0 ]]; then + # shellcheck disable=SC2034 + conflicts=("electron${_major_ver}") + # shellcheck disable=SC2034 + provides=("electron${_major_ver}") +fi +# shellcheck disable=SC2034 +options=('!lto') # Electron adds its own flags for ThinLTO +# shellcheck disable=SC2034 +source=('git+https://github.com/electron/electron.git' + 'git+https://chromium.googlesource.com/chromium/tools/depot_tools.git#branch=main' + "https://github.com/stha09/chromium-patches/releases/download/chromium-${_chromiumver%%.*}-patchset-${_gcc_patchset}/chromium-${_chromiumver%%.*}-patchset-${_gcc_patchset}.tar.xz" + "electron-launcher.sh" + "electron.desktop" + 'default_app-icon.patch' + 'jinja-python-3.10.patch' + 'std-vector-non-const.patch' + 'use-system-libraries-in-node.patch' + 'sql-make-VirtualCursor-standard-layout-type.patch' + 'wayland-fix-binding-to-wrong-version.patch' + 'unbundle-fix-visibility-of-build-config-freetype.patch' + 'chromium-93-ffmpeg-4.4.patch' + 'chromium-94-ffmpeg-roll.patch' + 'unexpire-accelerated-video-decode-flag.patch' + ) +# shellcheck disable=SC2034 +sha256sums=('SKIP' + 'SKIP' + '090af7eab39aade15a1786273f2497d6b4abfaef24279fbf97ce0dd1c38c69aa' + '3953f532a3ea5fce19ee33600c6ead89dcd066df6a01d3c3ab4c24f96e46fca2' + '4484200d90b76830b69eea3a471c103999a3ce86bb2c29e6c14c945bf4102bae' + '75bac9c4ad32ff9329399b8587f9772e208c009fd822cdfce61b2bd1ee9ac828' + '09de0ebb4002be7fb4ede63d3977e4f1235637750169c9e71bfdbd75bf750f7a' + '05598c7ccac38772503f00335916fe038db0d9aa240cf13a3b0f0ee69a382d98' + 'c70652a8b24c237bcfd27469de32797a2cb46d9f0d63d897bb6418314a25644c' + 'dd317f85e5abfdcfc89c6f23f4c8edbcdebdd5e083dcec770e5da49ee647d150' + 'fc2be146412d117869368f8559afef76ad39a3442ace16e5c7000bd45aa56b27' + 'd0b17162211dd49e3a58c16d1697e7d8c322dcfd3b7890f0c2f920b711f52293' + '1a9e074f417f8ffd78bcd6874d8e2e74a239905bf662f76a7755fa40dc476b57' + '56acb6e743d2ab1ed9f3eb01700ade02521769978d03ac43226dec94659b3ace' + '2a97b26c3d6821b15ef4ef1369905c6fa3e9c8da4877eb9af4361452a425290b' + ) + +_system_libs=('ffmpeg' + 'flac' + 'fontconfig' + 'freetype' + 'harfbuzz-ng' + 'icu' + 'libdrm' + 'libevent' + 'libjpeg' + 'libpng' +# 'libvpx' + 'libwebp' + 'libxml' + 'libxslt' +# 'openh264' + 'opus' + 're2' + 'snappy' + 'zlib' + ) + +prepare() { + sed -i "s|@ELECTRON@|${pkgname}|" electron-launcher.sh + sed -i "s|@ELECTRON@|${pkgname}|" electron.desktop + if [[ ${_use_suffix} != 0 ]]; then + sed -i "s|@ELECTRON_NAME@|Electron ${_major_ver}|" electron.desktop + else + sed -i "s|@ELECTRON_NAME@|Electron|" electron.desktop + fi + + export PATH="${PATH}:${srcdir:?}/depot_tools" + + echo "Fetching chromium..." + git clone --branch=${_chromiumver} --depth=1 \ + https://chromium.googlesource.com/chromium/src.git + + echo "solutions = [ + { + \"name\": \"src/electron\", + \"url\": \"file://${srcdir}/electron@${_commit}\", + \"deps_file\": \"DEPS\", + \"managed\": False, + \"custom_deps\": { + \"src\": None, + }, + \"custom_vars\": {}, + }, +]" > .gclient + + python "${srcdir}/depot_tools/gclient.py" sync \ + --with_branch_heads \ + --with_tags \ + --nohooks + + ( + cd src/electron || exit + patch -Np1 -i ../../std-vector-non-const.patch + ) + + echo "Running hooks..." + # python "${srcdir}/depot_tools/gclient.py" runhooks + src/build/landmines.py + src/build/util/lastchange.py -o src/build/util/LASTCHANGE + src/build/util/lastchange.py -m GPU_LISTS_VERSION \ + --revision-id-only --header src/gpu/config/gpu_lists_version.h + src/build/util/lastchange.py -m SKIA_COMMIT_HASH \ + -s src/third_party/skia --header src/skia/ext/skia_commit_hash.h + # Create sysmlink to system clang-format + ln -s /usr/bin/clang-format src/buildtools/linux64 + # Create sysmlink to system Node.js + mkdir -p src/third_party/node/linux/node-linux-x64/bin + ln -sf /usr/bin/node src/third_party/node/linux/node-linux-x64/bin + src/third_party/depot_tools/download_from_google_storage.py \ + --no_resume --extract --no_auth --bucket chromium-nodejs \ + -s src/third_party/node/node_modules.tar.gz.sha1 + vpython src/tools/download_optimization_profile.py \ + --newest_state=src/chrome/android/profiles/newest.txt \ + --local_state=src/chrome/android/profiles/local.txt \ + --output_name=src/chrome/android/profiles/afdo.prof \ + --gs_url_base=chromeos-prebuilt/afdo-job/llvm + #vpython src/tools/update_pgo_profiles.py \ + # --target=linux \ + # update \ + # --gs-url-base=chromium-optimization-profiles/pgo_profiles + src/electron/script/apply_all_patches.py \ + src/electron/patches/config.json + cd src/electron || exit + yarn install --frozen-lockfile + cd .. + + echo "Applying local patches..." + # Fixes for building with libstdc++ instead of libc++ + patch -Np1 -i ../patches/chromium-96-CommandLine-include.patch + patch -Np1 -i ../patches/chromium-96-RestrictedCookieManager-tuple.patch + patch -Np1 -i ../patches/chromium-96-DrmRenderNodePathFinder-include.patch + patch -Np1 -i ../patches/chromium-96-CouponDB-include.patch + + patch -Np1 -i ../unbundle-fix-visibility-of-build-config-freetype.patch + patch -Np1 -i ../chromium-93-ffmpeg-4.4.patch + patch -Rp1 -i ../chromium-94-ffmpeg-roll.patch + patch -Np1 -i ../sql-make-VirtualCursor-standard-layout-type.patch + patch -Np1 -i ../wayland-fix-binding-to-wrong-version.patch + patch -Np0 -i ../unexpire-accelerated-video-decode-flag.patch + patch -d third_party/electron_node/tools/inspector_protocol/jinja2 \ + -Np1 -i ../../../../../../jinja-python-3.10.patch + patch -Np1 -i ../use-system-libraries-in-node.patch + patch -Np1 -i ../default_app-icon.patch # Icon from .desktop file + + echo "Patching Chromium for using system libraries..." + sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \ + tools/generate_shim_headers/generate_shim_headers.py + for lib in $(printf "%s\n" "${_system_libs[@]}" | sed 's/^libjpeg$/&_turbo/'); do + third_party_dir="third_party/${lib}" + if [ ! -d "${third_party_dir}" ]; then + third_party_dir="base/${third_party_dir}" + fi + find "${third_party_dir}" -type f \ + \! -path "${third_party_dir}/chromium/*" \ + \! -path "${third_party_dir}/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() { + export CC=clang + export CXX=clang++ + export AR=ar + export NM=nm + + CFLAGS="${CFLAGS/-fexceptions/}" + CXXFLAGS="${CXXFLAGS/-fexceptions/}" + + # This appears to cause random segfaults + CFLAGS=${CFLAGS/-fstack-clash-protection} + CXXFLAGS=${CXXFLAGS/-fstack-clash-protection} + + # Do not warn about unknown warning options + CFLAGS+=' -Wno-unknown-warning-option' + CXXFLAGS+=' -Wno-unknown-warning-option' + + cd src || exit + export CHROMIUM_BUILDTOOLS_PATH="${PWD}/buildtools" + GN_EXTRA_ARGS=' + blink_symbol_level = 0 + chrome_pgo_phase = 0 + clang_use_chrome_plugins = false + custom_toolchain = "//build/toolchain/linux/unbundle:default" + host_toolchain = "//build/toolchain/linux/unbundle:default" + icu_use_data_file = false + is_component_ffmpeg = false + link_pulseaudio = true + rtc_use_pipewire = true + treat_warnings_as_errors = false + use_custom_libcxx = false + use_gnome_keyring = false + use_sysroot = false + ' + gn gen out/Release \ + --args="import(\"//electron/build/args/release.gn\") ${GN_EXTRA_ARGS}" + ninja -C out/Release electron + # Strip before zip to avoid + # zipfile.LargeZipFile: Filesize would require ZIP64 extensions + strip -s out/Release/electron + ninja -C out/Release electron_dist_zip + # ninja -C out/Release third_party/electron_node:headers +} + +package() { + install -dm755 "${pkgdir:?}/usr/lib/${pkgname}" + bsdtar -xf src/out/Release/dist.zip -C "${pkgdir}/usr/lib/${pkgname}" + + chmod u+s "${pkgdir}/usr/lib/${pkgname}/chrome-sandbox" + + install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}" + for l in "${pkgdir}/usr/lib/${pkgname}"/{LICENSE,LICENSES.chromium.html}; do + ln -s \ + "$(realpath --relative-to="${pkgdir}/usr/share/licenses/${pkgname}" "${l}")" \ + "${pkgdir}/usr/share/licenses/${pkgname}" + done + + install -Dm755 "${srcdir}/electron-launcher.sh" \ + "${pkgdir}/usr/bin/${pkgname}" + if [[ "${_use_suffix}" == 0 ]]; then + ln "${pkgdir}/usr/bin/${pkgname}" \ + "${pkgdir}/usr/bin/${pkgname}${_major_ver}" + fi + + # Install .desktop and icon file (see default_app-icon.patch) + install -Dm644 electron.desktop \ + "${pkgdir}/usr/share/applications/${pkgname}.desktop" + install -Dm644 src/electron/default_app/icon.png \ + "${pkgdir}/usr/share/pixmaps/${pkgname}.png" # hicolor has no 1024x1024 +} Deleted: chromium-93-ffmpeg-4.4.patch =================================================================== --- chromium-93-ffmpeg-4.4.patch 2022-01-27 19:07:10 UTC (rev 1117337) +++ chromium-93-ffmpeg-4.4.patch 2022-01-27 19:07:23 UTC (rev 1117338) @@ -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)); Copied: electron/repos/community-x86_64/chromium-93-ffmpeg-4.4.patch (from rev 1117337, electron/trunk/chromium-93-ffmpeg-4.4.patch) =================================================================== --- chromium-93-ffmpeg-4.4.patch (rev 0) +++ chromium-93-ffmpeg-4.4.patch 2022-01-27 19:07:23 UTC (rev 1117338) @@ -0,0 +1,36 @@ +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)); Deleted: chromium-94-ffmpeg-roll.patch =================================================================== --- chromium-94-ffmpeg-roll.patch 2022-01-27 19:07:10 UTC (rev 1117337) +++ chromium-94-ffmpeg-roll.patch 2022-01-27 19:07:23 UTC (rev 1117338) @@ -1,49 +0,0 @@ -From b94755e4633045be96ab5e0bdde0db7e16a804bd Mon Sep 17 00:00:00 2001 -From: "liber...@chromium.org" <liber...@chromium.org> -Date: Fri, 6 Aug 2021 04:25:31 +0000 -Subject: [PATCH] FFmpeg M94 roll. - -Contains DEPS update + chromium-side fixes. - -Bug: 1227259 -Change-Id: I61c5eaa789ea12c17d0cbcbf837435b9cf32479b -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3011889 -Reviewed-by: Thomas Guilbert <tguilb...@chromium.org> -Commit-Queue: Frank Liberato <liber...@chromium.org> -Cr-Commit-Position: refs/heads/master@{#909174} ---- - media/ffmpeg/ffmpeg_common.h | 1 + - media/filters/ffmpeg_demuxer.cc | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h -index cede8ac5a7..97d6307e28 100644 ---- a/media/ffmpeg/ffmpeg_common.h -+++ b/media/ffmpeg/ffmpeg_common.h -@@ -29,6 +29,7 @@ extern "C" { - #include <libavformat/avformat.h> - #include <libavformat/avio.h> - #include <libavutil/avutil.h> -+#include <libavutil/channel_layout.h> - #include <libavutil/imgutils.h> - #include <libavutil/log.h> - #include <libavutil/mastering_display_metadata.h> -diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc -index ac4713b072..605001d935 100644 ---- a/media/filters/ffmpeg_demuxer.cc -+++ b/media/filters/ffmpeg_demuxer.cc -@@ -106,12 +106,12 @@ static base::TimeDelta ExtractStartTime(AVStream* stream) { - - // Next try to use the first DTS value, for codecs where we know PTS == DTS - // (excludes all H26x codecs). The start time must be returned in PTS. -- if (stream->first_dts != kNoFFmpegTimestamp && -+ if (av_stream_get_first_dts(stream) != kNoFFmpegTimestamp && - stream->codecpar->codec_id != AV_CODEC_ID_HEVC && - stream->codecpar->codec_id != AV_CODEC_ID_H264 && - stream->codecpar->codec_id != AV_CODEC_ID_MPEG4) { - const base::TimeDelta first_pts = -- ConvertFromTimeBase(stream->time_base, stream->first_dts); -+ ConvertFromTimeBase(stream->time_base, av_stream_get_first_dts(stream)); - if (first_pts < start_time) - start_time = first_pts; - } Copied: electron/repos/community-x86_64/chromium-94-ffmpeg-roll.patch (from rev 1117337, electron/trunk/chromium-94-ffmpeg-roll.patch) =================================================================== --- chromium-94-ffmpeg-roll.patch (rev 0) +++ chromium-94-ffmpeg-roll.patch 2022-01-27 19:07:23 UTC (rev 1117338) @@ -0,0 +1,49 @@ +From b94755e4633045be96ab5e0bdde0db7e16a804bd Mon Sep 17 00:00:00 2001 +From: "liber...@chromium.org" <liber...@chromium.org> +Date: Fri, 6 Aug 2021 04:25:31 +0000 +Subject: [PATCH] FFmpeg M94 roll. + +Contains DEPS update + chromium-side fixes. + +Bug: 1227259 +Change-Id: I61c5eaa789ea12c17d0cbcbf837435b9cf32479b +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3011889 +Reviewed-by: Thomas Guilbert <tguilb...@chromium.org> +Commit-Queue: Frank Liberato <liber...@chromium.org> +Cr-Commit-Position: refs/heads/master@{#909174} +--- + media/ffmpeg/ffmpeg_common.h | 1 + + media/filters/ffmpeg_demuxer.cc | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h +index cede8ac5a7..97d6307e28 100644 +--- a/media/ffmpeg/ffmpeg_common.h ++++ b/media/ffmpeg/ffmpeg_common.h +@@ -29,6 +29,7 @@ extern "C" { + #include <libavformat/avformat.h> + #include <libavformat/avio.h> + #include <libavutil/avutil.h> ++#include <libavutil/channel_layout.h> + #include <libavutil/imgutils.h> + #include <libavutil/log.h> + #include <libavutil/mastering_display_metadata.h> +diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc +index ac4713b072..605001d935 100644 +--- a/media/filters/ffmpeg_demuxer.cc ++++ b/media/filters/ffmpeg_demuxer.cc +@@ -106,12 +106,12 @@ static base::TimeDelta ExtractStartTime(AVStream* stream) { + + // Next try to use the first DTS value, for codecs where we know PTS == DTS + // (excludes all H26x codecs). The start time must be returned in PTS. +- if (stream->first_dts != kNoFFmpegTimestamp && ++ if (av_stream_get_first_dts(stream) != kNoFFmpegTimestamp && + stream->codecpar->codec_id != AV_CODEC_ID_HEVC && + stream->codecpar->codec_id != AV_CODEC_ID_H264 && + stream->codecpar->codec_id != AV_CODEC_ID_MPEG4) { + const base::TimeDelta first_pts = +- ConvertFromTimeBase(stream->time_base, stream->first_dts); ++ ConvertFromTimeBase(stream->time_base, av_stream_get_first_dts(stream)); + if (first_pts < start_time) + start_time = first_pts; + } Deleted: default_app-icon.patch =================================================================== --- default_app-icon.patch 2022-01-27 19:07:10 UTC (rev 1117337) +++ default_app-icon.patch 2022-01-27 19:07:23 UTC (rev 1117338) @@ -1,21 +0,0 @@ ---- a/electron/default_app/default_app.ts -+++ b/electron/default_app/default_app.ts -@@ -59,7 +59,7 @@ - }; - - if (process.platform === 'linux') { -- options.icon = path.join(__dirname, 'icon.png'); -+ options.icon = '/usr/share/pixmaps/electron.png'; - } - - mainWindow = new BrowserWindow(options); ---- a/electron/filenames.gni -+++ b/electron/filenames.gni -@@ -6,7 +6,6 @@ - ] - - default_app_static_sources = [ -- "default_app/icon.png", - "default_app/index.html", - "default_app/package.json", - "default_app/styles.css", Copied: electron/repos/community-x86_64/default_app-icon.patch (from rev 1117337, electron/trunk/default_app-icon.patch) =================================================================== --- default_app-icon.patch (rev 0) +++ default_app-icon.patch 2022-01-27 19:07:23 UTC (rev 1117338) @@ -0,0 +1,21 @@ +--- a/electron/default_app/default_app.ts ++++ b/electron/default_app/default_app.ts +@@ -59,7 +59,7 @@ + }; + + if (process.platform === 'linux') { +- options.icon = path.join(__dirname, 'icon.png'); ++ options.icon = '/usr/share/pixmaps/electron.png'; + } + + mainWindow = new BrowserWindow(options); +--- a/electron/filenames.gni ++++ b/electron/filenames.gni +@@ -6,7 +6,6 @@ + ] + + default_app_static_sources = [ +- "default_app/icon.png", + "default_app/index.html", + "default_app/package.json", + "default_app/styles.css", Deleted: electron-launcher.sh =================================================================== --- electron-launcher.sh 2022-01-27 19:07:10 UTC (rev 1117337) +++ electron-launcher.sh 2022-01-27 19:07:23 UTC (rev 1117338) @@ -1,20 +0,0 @@ -#!/usr/bin/bash - -set -euo pipefail - -name=@ELECTRON@ -flags_file="${XDG_CONFIG_HOME:-$HOME/.config}/${name}-flags.conf" - -declare -a flags - -if [[ -f "${flags_file}" ]]; then - mapfile -t < "${flags_file}" -fi - -for line in "${MAPFILE[@]}"; do - if [[ ! "${line}" =~ ^[[:space:]]*#.* ]]; then - flags+=("${line}") - fi -done - -exec /usr/lib/${name}/electron "$@" "${flags[@]}" Copied: electron/repos/community-x86_64/electron-launcher.sh (from rev 1117337, electron/trunk/electron-launcher.sh) =================================================================== --- electron-launcher.sh (rev 0) +++ electron-launcher.sh 2022-01-27 19:07:23 UTC (rev 1117338) @@ -0,0 +1,20 @@ +#!/usr/bin/bash + +set -euo pipefail + +name=@ELECTRON@ +flags_file="${XDG_CONFIG_HOME:-$HOME/.config}/${name}-flags.conf" + +declare -a flags + +if [[ -f "${flags_file}" ]]; then + mapfile -t < "${flags_file}" +fi + +for line in "${MAPFILE[@]}"; do + if [[ ! "${line}" =~ ^[[:space:]]*#.* ]]; then + flags+=("${line}") + fi +done + +exec /usr/lib/${name}/electron "$@" "${flags[@]}" Deleted: electron.desktop =================================================================== --- electron.desktop 2022-01-27 19:07:10 UTC (rev 1117337) +++ electron.desktop 2022-01-27 19:07:23 UTC (rev 1117338) @@ -1,7 +0,0 @@ -[Desktop Entry] -Type=Application -Name=@ELECTRON_NAME@ -Icon=@ELECTRON@ -Exec=@ELECTRON@ %u -Categories=Development;GTK; -StartupNotify=true Copied: electron/repos/community-x86_64/electron.desktop (from rev 1117337, electron/trunk/electron.desktop) =================================================================== --- electron.desktop (rev 0) +++ electron.desktop 2022-01-27 19:07:23 UTC (rev 1117338) @@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Application +Name=@ELECTRON_NAME@ +Icon=@ELECTRON@ +Exec=@ELECTRON@ %u +Categories=Development;GTK; +StartupNotify=true Deleted: jinja-python-3.10.patch =================================================================== --- jinja-python-3.10.patch 2022-01-27 19:07:10 UTC (rev 1117337) +++ jinja-python-3.10.patch 2022-01-27 19:07:23 UTC (rev 1117338) @@ -1,33 +0,0 @@ ---- a/runtime.py -+++ b/runtime.py -@@ -315,7 +315,7 @@ class Context(with_metaclass(ContextMeta - - # register the context as mapping if possible - try: -- from collections import Mapping -+ from collections.abc import Mapping - Mapping.register(Context) - except ImportError: - pass ---- a/sandbox.py -+++ b/sandbox.py -@@ -14,7 +14,7 @@ - """ - import types - import operator --from collections import Mapping -+from collections.abc import Mapping - from jinja2.environment import Environment - from jinja2.exceptions import SecurityError - from jinja2._compat import string_types, PY2 ---- a/tests.py -+++ b/tests.py -@@ -10,7 +10,7 @@ - """ - import operator - import re --from collections import Mapping -+from collections.abc import Mapping - from jinja2.runtime import Undefined - from jinja2._compat import text_type, string_types, integer_types - import decimal Copied: electron/repos/community-x86_64/jinja-python-3.10.patch (from rev 1117337, electron/trunk/jinja-python-3.10.patch) =================================================================== --- jinja-python-3.10.patch (rev 0) +++ jinja-python-3.10.patch 2022-01-27 19:07:23 UTC (rev 1117338) @@ -0,0 +1,33 @@ +--- a/runtime.py ++++ b/runtime.py +@@ -315,7 +315,7 @@ class Context(with_metaclass(ContextMeta + + # register the context as mapping if possible + try: +- from collections import Mapping ++ from collections.abc import Mapping + Mapping.register(Context) + except ImportError: + pass +--- a/sandbox.py ++++ b/sandbox.py +@@ -14,7 +14,7 @@ + """ + import types + import operator +-from collections import Mapping ++from collections.abc import Mapping + from jinja2.environment import Environment + from jinja2.exceptions import SecurityError + from jinja2._compat import string_types, PY2 +--- a/tests.py ++++ b/tests.py +@@ -10,7 +10,7 @@ + """ + import operator + import re +-from collections import Mapping ++from collections.abc import Mapping + from jinja2.runtime import Undefined + from jinja2._compat import text_type, string_types, integer_types + import decimal Deleted: sql-make-VirtualCursor-standard-layout-type.patch =================================================================== --- sql-make-VirtualCursor-standard-layout-type.patch 2022-01-27 19:07:10 UTC (rev 1117337) +++ sql-make-VirtualCursor-standard-layout-type.patch 2022-01-27 19:07:23 UTC (rev 1117338) @@ -1,238 +0,0 @@ -From 80368f8ba7a8bab13440463a254888311efe3986 Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann <sth...@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: electron/repos/community-x86_64/sql-make-VirtualCursor-standard-layout-type.patch (from rev 1117337, electron/trunk/sql-make-VirtualCursor-standard-layout-type.patch) =================================================================== --- sql-make-VirtualCursor-standard-layout-type.patch (rev 0) +++ sql-make-VirtualCursor-standard-layout-type.patch 2022-01-27 19:07:23 UTC (rev 1117338) @@ -0,0 +1,238 @@ +From 80368f8ba7a8bab13440463a254888311efe3986 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann <sth...@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_; Deleted: std-vector-non-const.patch =================================================================== --- std-vector-non-const.patch 2022-01-27 19:07:10 UTC (rev 1117337) +++ std-vector-non-const.patch 2022-01-27 19:07:23 UTC (rev 1117338) @@ -1,115 +0,0 @@ -diff --git a/patches/chromium/feat_add_data_parameter_to_processsingleton.patch b/patches/chromium/feat_add_data_parameter_to_processsingleton.patch -index 2bc279b5e..f15d952a2 100644 ---- a/patches/chromium/feat_add_data_parameter_to_processsingleton.patch -+++ b/patches/chromium/feat_add_data_parameter_to_processsingleton.patch -@@ -30,7 +30,7 @@ index eec994c4252f17d9c9c41e66d5dae6509ed98a18..e538c9b76da4d4435e10cd3848438446 - base::RepeatingCallback<bool(const base::CommandLine& command_line, - - const base::FilePath& current_directory)>; - + const base::FilePath& current_directory, --+ const std::vector<const uint8_t> additional_data)>; -++ const std::vector<uint8_t> additional_data)>; - - #if defined(OS_WIN) - ProcessSingleton(const std::string& program_name, -@@ -68,7 +68,7 @@ index a04d139f958a7aaef9b96e8c29317ccf7c97f009..e77cebd31967d28f3cb0db78e7360115 - // |reader| is for sending back ACK message. - void HandleMessage(const std::string& current_dir, - const std::vector<std::string>& argv, --+ const std::vector<const uint8_t> additional_data, -++ const std::vector<uint8_t> additional_data, - SocketReader* reader); - - private: -@@ -79,7 +79,7 @@ index a04d139f958a7aaef9b96e8c29317ccf7c97f009..e77cebd31967d28f3cb0db78e7360115 - - const std::string& current_dir, const std::vector<std::string>& argv, - + const std::string& current_dir, - + const std::vector<std::string>& argv, --+ const std::vector<const uint8_t> additional_data, -++ const std::vector<uint8_t> additional_data, - SocketReader* reader) { - DCHECK(ui_task_runner_->BelongsToCurrentThread()); - DCHECK(reader); -@@ -109,7 +109,7 @@ index a04d139f958a7aaef9b96e8c29317ccf7c97f009..e77cebd31967d28f3cb0db78e7360115 - + base::StringToSizeT(tokens[0], &num_args); - + std::vector<std::string> command_line(tokens.begin() + 1, tokens.begin() + 1 + num_args); - + --+ std::vector<const uint8_t> additional_data; -++ std::vector<uint8_t> additional_data; - + if (tokens.size() >= 3 + num_args) { - + size_t additional_data_size; - + base::StringToSizeT(tokens[1 + num_args], &additional_data_size); -@@ -118,7 +118,7 @@ index a04d139f958a7aaef9b96e8c29317ccf7c97f009..e77cebd31967d28f3cb0db78e7360115 - + std::string(1, kTokenDelimiter)); - + const uint8_t* additional_data_bits = - + reinterpret_cast<const uint8_t*>(remaining_args.c_str()); --+ additional_data = std::vector<const uint8_t>( -++ additional_data = std::vector<uint8_t>( - + additional_data_bits, additional_data_bits + additional_data_size); - + } - + -@@ -184,7 +184,7 @@ index 19d5659d665321da54e05cee01be7da02e0c283b..600ff701b025ba190d05bc30994e3d3e - base::CommandLine* parsed_command_line, - - base::FilePath* current_directory) { - + base::FilePath* current_directory, --+ std::vector<const uint8_t>* parsed_additional_data) { -++ std::vector<uint8_t>* parsed_additional_data) { - // We should have enough room for the shortest command (min_message_size) - // and also be a multiple of wchar_t bytes. The shortest command - - // possible is L"START\0\0" (empty current directory and command line). -@@ -225,7 +225,7 @@ index 19d5659d665321da54e05cee01be7da02e0c283b..600ff701b025ba190d05bc30994e3d3e - + msg.substr(fourth_null + 1, fifth_null - fourth_null); - + const uint8_t* additional_data_bytes = - + reinterpret_cast<const uint8_t*>(additional_data.c_str()); --+ *parsed_additional_data = std::vector<const uint8_t>(additional_data_bytes, -++ *parsed_additional_data = std::vector<uint8_t>(additional_data_bytes, - + additional_data_bytes + additional_data_length); - + - return true; -@@ -239,7 +239,7 @@ index 19d5659d665321da54e05cee01be7da02e0c283b..600ff701b025ba190d05bc30994e3d3e - base::CommandLine parsed_command_line(base::CommandLine::NO_PROGRAM); - base::FilePath current_directory; - - if (!ParseCommandLine(cds, &parsed_command_line, ¤t_directory)) { --+ std::vector<const uint8_t> additional_data; -++ std::vector<uint8_t> additional_data; - + if (!ParseCommandLine(cds, &parsed_command_line, ¤t_directory, &additional_data)) { - *result = TRUE; - return true; -diff --git a/shell/browser/api/electron_api_app.cc b/shell/browser/api/electron_api_app.cc -index 7328cedf9..9945a04b2 100644 ---- a/shell/browser/api/electron_api_app.cc -+++ b/shell/browser/api/electron_api_app.cc -@@ -517,10 +517,10 @@ bool NotificationCallbackWrapper( - const base::RepeatingCallback< - void(const base::CommandLine& command_line, - const base::FilePath& current_directory, -- const std::vector<const uint8_t> additional_data)>& callback, -+ const std::vector<uint8_t> additional_data)>& callback, - const base::CommandLine& cmd, - const base::FilePath& cwd, -- const std::vector<const uint8_t> additional_data) { -+ const std::vector<uint8_t> additional_data) { - // Make sure the callback is called after app gets ready. - if (Browser::Get()->is_ready()) { - callback.Run(cmd, cwd, std::move(additional_data)); -@@ -1078,7 +1078,7 @@ std::string App::GetLocaleCountryCode() { - - void App::OnSecondInstance(const base::CommandLine& cmd, - const base::FilePath& cwd, -- const std::vector<const uint8_t> additional_data) { -+ const std::vector<uint8_t> additional_data) { - v8::Isolate* isolate = JavascriptEnvironment::GetIsolate(); - v8::Locker locker(isolate); - v8::HandleScope handle_scope(isolate); -diff --git a/shell/browser/api/electron_api_app.h b/shell/browser/api/electron_api_app.h -index fd644ed95..838366041 100644 ---- a/shell/browser/api/electron_api_app.h -+++ b/shell/browser/api/electron_api_app.h -@@ -190,7 +190,7 @@ class App : public ElectronBrowserClient::Delegate, - std::string GetLocaleCountryCode(); - void OnSecondInstance(const base::CommandLine& cmd, - const base::FilePath& cwd, -- const std::vector<const uint8_t> additional_data); -+ const std::vector<uint8_t> additional_data); - bool HasSingleInstanceLock() const; - bool RequestSingleInstanceLock(gin::Arguments* args); - void ReleaseSingleInstanceLock(); Copied: electron/repos/community-x86_64/std-vector-non-const.patch (from rev 1117337, electron/trunk/std-vector-non-const.patch) =================================================================== --- std-vector-non-const.patch (rev 0) +++ std-vector-non-const.patch 2022-01-27 19:07:23 UTC (rev 1117338) @@ -0,0 +1,115 @@ +diff --git a/patches/chromium/feat_add_data_parameter_to_processsingleton.patch b/patches/chromium/feat_add_data_parameter_to_processsingleton.patch +index 2bc279b5e..f15d952a2 100644 +--- a/patches/chromium/feat_add_data_parameter_to_processsingleton.patch ++++ b/patches/chromium/feat_add_data_parameter_to_processsingleton.patch +@@ -30,7 +30,7 @@ index eec994c4252f17d9c9c41e66d5dae6509ed98a18..e538c9b76da4d4435e10cd3848438446 + base::RepeatingCallback<bool(const base::CommandLine& command_line, + - const base::FilePath& current_directory)>; + + const base::FilePath& current_directory, +-+ const std::vector<const uint8_t> additional_data)>; +++ const std::vector<uint8_t> additional_data)>; + + #if defined(OS_WIN) + ProcessSingleton(const std::string& program_name, +@@ -68,7 +68,7 @@ index a04d139f958a7aaef9b96e8c29317ccf7c97f009..e77cebd31967d28f3cb0db78e7360115 + // |reader| is for sending back ACK message. + void HandleMessage(const std::string& current_dir, + const std::vector<std::string>& argv, +-+ const std::vector<const uint8_t> additional_data, +++ const std::vector<uint8_t> additional_data, + SocketReader* reader); + + private: +@@ -79,7 +79,7 @@ index a04d139f958a7aaef9b96e8c29317ccf7c97f009..e77cebd31967d28f3cb0db78e7360115 + - const std::string& current_dir, const std::vector<std::string>& argv, + + const std::string& current_dir, + + const std::vector<std::string>& argv, +-+ const std::vector<const uint8_t> additional_data, +++ const std::vector<uint8_t> additional_data, + SocketReader* reader) { + DCHECK(ui_task_runner_->BelongsToCurrentThread()); + DCHECK(reader); +@@ -109,7 +109,7 @@ index a04d139f958a7aaef9b96e8c29317ccf7c97f009..e77cebd31967d28f3cb0db78e7360115 + + base::StringToSizeT(tokens[0], &num_args); + + std::vector<std::string> command_line(tokens.begin() + 1, tokens.begin() + 1 + num_args); + + +-+ std::vector<const uint8_t> additional_data; +++ std::vector<uint8_t> additional_data; + + if (tokens.size() >= 3 + num_args) { + + size_t additional_data_size; + + base::StringToSizeT(tokens[1 + num_args], &additional_data_size); +@@ -118,7 +118,7 @@ index a04d139f958a7aaef9b96e8c29317ccf7c97f009..e77cebd31967d28f3cb0db78e7360115 + + std::string(1, kTokenDelimiter)); + + const uint8_t* additional_data_bits = + + reinterpret_cast<const uint8_t*>(remaining_args.c_str()); +-+ additional_data = std::vector<const uint8_t>( +++ additional_data = std::vector<uint8_t>( + + additional_data_bits, additional_data_bits + additional_data_size); + + } + + +@@ -184,7 +184,7 @@ index 19d5659d665321da54e05cee01be7da02e0c283b..600ff701b025ba190d05bc30994e3d3e + base::CommandLine* parsed_command_line, + - base::FilePath* current_directory) { + + base::FilePath* current_directory, +-+ std::vector<const uint8_t>* parsed_additional_data) { +++ std::vector<uint8_t>* parsed_additional_data) { + // We should have enough room for the shortest command (min_message_size) + // and also be a multiple of wchar_t bytes. The shortest command + - // possible is L"START\0\0" (empty current directory and command line). +@@ -225,7 +225,7 @@ index 19d5659d665321da54e05cee01be7da02e0c283b..600ff701b025ba190d05bc30994e3d3e + + msg.substr(fourth_null + 1, fifth_null - fourth_null); + + const uint8_t* additional_data_bytes = + + reinterpret_cast<const uint8_t*>(additional_data.c_str()); +-+ *parsed_additional_data = std::vector<const uint8_t>(additional_data_bytes, +++ *parsed_additional_data = std::vector<uint8_t>(additional_data_bytes, + + additional_data_bytes + additional_data_length); + + + return true; +@@ -239,7 +239,7 @@ index 19d5659d665321da54e05cee01be7da02e0c283b..600ff701b025ba190d05bc30994e3d3e + base::CommandLine parsed_command_line(base::CommandLine::NO_PROGRAM); + base::FilePath current_directory; + - if (!ParseCommandLine(cds, &parsed_command_line, ¤t_directory)) { +-+ std::vector<const uint8_t> additional_data; +++ std::vector<uint8_t> additional_data; + + if (!ParseCommandLine(cds, &parsed_command_line, ¤t_directory, &additional_data)) { + *result = TRUE; + return true; +diff --git a/shell/browser/api/electron_api_app.cc b/shell/browser/api/electron_api_app.cc +index 7328cedf9..9945a04b2 100644 +--- a/shell/browser/api/electron_api_app.cc ++++ b/shell/browser/api/electron_api_app.cc +@@ -517,10 +517,10 @@ bool NotificationCallbackWrapper( + const base::RepeatingCallback< + void(const base::CommandLine& command_line, + const base::FilePath& current_directory, +- const std::vector<const uint8_t> additional_data)>& callback, ++ const std::vector<uint8_t> additional_data)>& callback, + const base::CommandLine& cmd, + const base::FilePath& cwd, +- const std::vector<const uint8_t> additional_data) { ++ const std::vector<uint8_t> additional_data) { + // Make sure the callback is called after app gets ready. + if (Browser::Get()->is_ready()) { + callback.Run(cmd, cwd, std::move(additional_data)); +@@ -1078,7 +1078,7 @@ std::string App::GetLocaleCountryCode() { + + void App::OnSecondInstance(const base::CommandLine& cmd, + const base::FilePath& cwd, +- const std::vector<const uint8_t> additional_data) { ++ const std::vector<uint8_t> additional_data) { + v8::Isolate* isolate = JavascriptEnvironment::GetIsolate(); + v8::Locker locker(isolate); + v8::HandleScope handle_scope(isolate); +diff --git a/shell/browser/api/electron_api_app.h b/shell/browser/api/electron_api_app.h +index fd644ed95..838366041 100644 +--- a/shell/browser/api/electron_api_app.h ++++ b/shell/browser/api/electron_api_app.h +@@ -190,7 +190,7 @@ class App : public ElectronBrowserClient::Delegate, + std::string GetLocaleCountryCode(); + void OnSecondInstance(const base::CommandLine& cmd, + const base::FilePath& cwd, +- const std::vector<const uint8_t> additional_data); ++ const std::vector<uint8_t> additional_data); + bool HasSingleInstanceLock() const; + bool RequestSingleInstanceLock(gin::Arguments* args); + void ReleaseSingleInstanceLock(); Deleted: unbundle-fix-visibility-of-build-config-freetype.patch =================================================================== --- unbundle-fix-visibility-of-build-config-freetype.patch 2022-01-27 19:07:10 UTC (rev 1117337) +++ unbundle-fix-visibility-of-build-config-freetype.patch 2022-01-27 19:07:23 UTC (rev 1117338) @@ -1,31 +0,0 @@ -From 271e45339b7b969e98ccef7837cb1b15480b07fc Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann <sth...@googlemail.com> -Date: Thu, 4 Nov 2021 18:58:34 +0000 -Subject: [PATCH] unbundle: fix visibility of //build/config/freetype - -For system freetype //build/linux:freetype_from_pkgconfig is restricted -to //third_party:freetype_harfbuzz and //third_party/harfbuzz-ng:harfbuzz_source. -However //build/config/freetype:freetype is accessing it too. - -Bug: None -Change-Id: Ic4a37b01e4ae221372a9220cbad04c598b844c21 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3259304 -Commit-Queue: Thomas Anderson <thomasander...@chromium.org> -Reviewed-by: Thomas Anderson <thomasander...@chromium.org> -Cr-Commit-Position: refs/heads/main@{#938388} ---- - build/linux/BUILD.gn | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/build/linux/BUILD.gn b/build/linux/BUILD.gn -index 54314c7687..cd49e3d524 100644 ---- a/build/linux/BUILD.gn -+++ b/build/linux/BUILD.gn -@@ -23,6 +23,7 @@ if (use_system_freetype) { - # the system, use with caution,for details see build/config/freetype/BUILD.gn. - pkg_config("freetype_from_pkgconfig") { - visibility = [ -+ "//build/config/freetype:freetype", - "//third_party:freetype_harfbuzz", - "//third_party/harfbuzz-ng:harfbuzz_source", - ] Copied: electron/repos/community-x86_64/unbundle-fix-visibility-of-build-config-freetype.patch (from rev 1117337, electron/trunk/unbundle-fix-visibility-of-build-config-freetype.patch) =================================================================== --- unbundle-fix-visibility-of-build-config-freetype.patch (rev 0) +++ unbundle-fix-visibility-of-build-config-freetype.patch 2022-01-27 19:07:23 UTC (rev 1117338) @@ -0,0 +1,31 @@ +From 271e45339b7b969e98ccef7837cb1b15480b07fc Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann <sth...@googlemail.com> +Date: Thu, 4 Nov 2021 18:58:34 +0000 +Subject: [PATCH] unbundle: fix visibility of //build/config/freetype + +For system freetype //build/linux:freetype_from_pkgconfig is restricted +to //third_party:freetype_harfbuzz and //third_party/harfbuzz-ng:harfbuzz_source. +However //build/config/freetype:freetype is accessing it too. + +Bug: None +Change-Id: Ic4a37b01e4ae221372a9220cbad04c598b844c21 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3259304 +Commit-Queue: Thomas Anderson <thomasander...@chromium.org> +Reviewed-by: Thomas Anderson <thomasander...@chromium.org> +Cr-Commit-Position: refs/heads/main@{#938388} +--- + build/linux/BUILD.gn | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/build/linux/BUILD.gn b/build/linux/BUILD.gn +index 54314c7687..cd49e3d524 100644 +--- a/build/linux/BUILD.gn ++++ b/build/linux/BUILD.gn +@@ -23,6 +23,7 @@ if (use_system_freetype) { + # the system, use with caution,for details see build/config/freetype/BUILD.gn. + pkg_config("freetype_from_pkgconfig") { + visibility = [ ++ "//build/config/freetype:freetype", + "//third_party:freetype_harfbuzz", + "//third_party/harfbuzz-ng:harfbuzz_source", + ] Deleted: unexpire-accelerated-video-decode-flag.patch =================================================================== --- unexpire-accelerated-video-decode-flag.patch 2022-01-27 19:07:10 UTC (rev 1117337) +++ unexpire-accelerated-video-decode-flag.patch 2022-01-27 19:07:23 UTC (rev 1117338) @@ -1,11 +0,0 @@ ---- 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-...@chromium.org" ], -- "expiry_milestone": 93 -+ "expiry_milestone": 99 - }, - { - "name": "enable-accessibility-live-caption", Copied: electron/repos/community-x86_64/unexpire-accelerated-video-decode-flag.patch (from rev 1117337, electron/trunk/unexpire-accelerated-video-decode-flag.patch) =================================================================== --- unexpire-accelerated-video-decode-flag.patch (rev 0) +++ unexpire-accelerated-video-decode-flag.patch 2022-01-27 19:07:23 UTC (rev 1117338) @@ -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-...@chromium.org" ], +- "expiry_milestone": 93 ++ "expiry_milestone": 99 + }, + { + "name": "enable-accessibility-live-caption", Deleted: use-system-libraries-in-node.patch =================================================================== --- use-system-libraries-in-node.patch 2022-01-27 19:07:10 UTC (rev 1117337) +++ use-system-libraries-in-node.patch 2022-01-27 19:07:23 UTC (rev 1117338) @@ -1,53 +0,0 @@ ---- a/third_party/electron_node/BUILD.gn -+++ b/third_party/electron_node/BUILD.gn -@@ -42,6 +42,18 @@ - node_module_version = "" - } - -+if (is_linux) { -+ import("//build/config/linux/pkg_config.gni") -+ -+ pkg_config("cares") { -+ packages = [ "libcares" ] -+ } -+ -+ pkg_config("nghttp2") { -+ packages = [ "libnghttp2" ] -+ } -+} -+ - assert(!node_use_dtrace, "node_use_dtrace not supported in GN") - assert(!node_use_etw, "node_use_etw not supported in GN") - -@@ -182,11 +194,9 @@ - component("node_lib") { - deps = [ - ":node_js2c", -- "deps/cares", - "deps/histogram", - "deps/googletest:gtest", - "deps/llhttp", -- "deps/nghttp2", - "deps/uvwasi", - "//third_party/zlib", - "//third_party/brotli:dec", -@@ -202,6 +212,19 @@ - public_configs = [ ":node_lib_config" ] - include_dirs = [ "src" ] - libs = [] -+ if (is_linux) { -+ configs += [ -+ ":cares", -+ ":nghttp2", -+ ] -+ libs += [ "http_parser" ] -+ } else { -+ deps += [ -+ "deps/cares", -+ "deps/http_parser", -+ "deps/nghttp2", -+ ] -+ } - frameworks = [] - cflags_cc = [ - "-Wno-deprecated-declarations", Copied: electron/repos/community-x86_64/use-system-libraries-in-node.patch (from rev 1117337, electron/trunk/use-system-libraries-in-node.patch) =================================================================== --- use-system-libraries-in-node.patch (rev 0) +++ use-system-libraries-in-node.patch 2022-01-27 19:07:23 UTC (rev 1117338) @@ -0,0 +1,53 @@ +--- a/third_party/electron_node/BUILD.gn ++++ b/third_party/electron_node/BUILD.gn +@@ -42,6 +42,18 @@ + node_module_version = "" + } + ++if (is_linux) { ++ import("//build/config/linux/pkg_config.gni") ++ ++ pkg_config("cares") { ++ packages = [ "libcares" ] ++ } ++ ++ pkg_config("nghttp2") { ++ packages = [ "libnghttp2" ] ++ } ++} ++ + assert(!node_use_dtrace, "node_use_dtrace not supported in GN") + assert(!node_use_etw, "node_use_etw not supported in GN") + +@@ -182,11 +194,9 @@ + component("node_lib") { + deps = [ + ":node_js2c", +- "deps/cares", + "deps/histogram", + "deps/googletest:gtest", + "deps/llhttp", +- "deps/nghttp2", + "deps/uvwasi", + "//third_party/zlib", + "//third_party/brotli:dec", +@@ -202,6 +212,19 @@ + public_configs = [ ":node_lib_config" ] + include_dirs = [ "src" ] + libs = [] ++ if (is_linux) { ++ configs += [ ++ ":cares", ++ ":nghttp2", ++ ] ++ libs += [ "http_parser" ] ++ } else { ++ deps += [ ++ "deps/cares", ++ "deps/http_parser", ++ "deps/nghttp2", ++ ] ++ } + frameworks = [] + cflags_cc = [ + "-Wno-deprecated-declarations", Deleted: wayland-fix-binding-to-wrong-version.patch =================================================================== --- wayland-fix-binding-to-wrong-version.patch 2022-01-27 19:07:10 UTC (rev 1117337) +++ wayland-fix-binding-to-wrong-version.patch 2022-01-27 19:07:23 UTC (rev 1117338) @@ -1,651 +0,0 @@ -From 549451e06c2bc2cec76694b619e4adf3dff87242 Mon Sep 17 00:00:00 2001 -From: Alexander Dunaev <adun...@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 <msi...@igalia.com> -Commit-Queue: Alexander Dunaev <adun...@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 ++++---- - .../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 ++++---- - 19 files changed, 124 insertions(+), 65 deletions(-) - -diff --git a/ui/ozone/platform/wayland/common/wayland_object.cc b/ui/ozone/platform/wayland/common/wayland_object.cc -index e97d5264e47..a6ba798e2bd 100644 ---- a/ui/ozone/platform/wayland/common/wayland_object.cc -+++ b/ui/ozone/platform/wayland/common/wayland_object.cc -@@ -34,6 +34,8 @@ - #include <xdg-shell-client-protocol.h> - #include <xdg-shell-unstable-v6-client-protocol.h> - -+#include "base/logging.h" -+ - namespace wl { - namespace { - -@@ -76,6 +78,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 145c0137b59..f929b6ecffe 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/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 7f5289197bc..fc41f9a12f5 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 a9e72376987..9aaef1354f8 100644 ---- a/ui/ozone/platform/wayland/host/wayland_zaura_shell.cc -+++ b/ui/ozone/platform/wayland/host/wayland_zaura_shell.cc -@@ -18,7 +18,8 @@ - namespace ui { - - namespace { --constexpr uint32_t kMaxAuraShellVersion = 24; -+constexpr uint32_t kMinVersion = 1; -+constexpr uint32_t kMaxVersion = 24; - } - - // static -@@ -32,11 +33,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 d7b8201c173e07b0e2bd1f9ad829c8f4fe81a7a3 Mon Sep 17 00:00:00 2001 -From: Alexander Dunaev <adun...@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 <toniki...@igalia.com> -Commit-Queue: Alexander Dunaev <adun...@igalia.com> -Auto-Submit: Alexander Dunaev <adun...@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; - } - Copied: electron/repos/community-x86_64/wayland-fix-binding-to-wrong-version.patch (from rev 1117337, electron/trunk/wayland-fix-binding-to-wrong-version.patch) =================================================================== --- wayland-fix-binding-to-wrong-version.patch (rev 0) +++ wayland-fix-binding-to-wrong-version.patch 2022-01-27 19:07:23 UTC (rev 1117338) @@ -0,0 +1,651 @@ +From 549451e06c2bc2cec76694b619e4adf3dff87242 Mon Sep 17 00:00:00 2001 +From: Alexander Dunaev <adun...@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 <msi...@igalia.com> +Commit-Queue: Alexander Dunaev <adun...@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 ++++---- + .../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 ++++---- + 19 files changed, 124 insertions(+), 65 deletions(-) + +diff --git a/ui/ozone/platform/wayland/common/wayland_object.cc b/ui/ozone/platform/wayland/common/wayland_object.cc +index e97d5264e47..a6ba798e2bd 100644 +--- a/ui/ozone/platform/wayland/common/wayland_object.cc ++++ b/ui/ozone/platform/wayland/common/wayland_object.cc +@@ -34,6 +34,8 @@ + #include <xdg-shell-client-protocol.h> + #include <xdg-shell-unstable-v6-client-protocol.h> + ++#include "base/logging.h" ++ + namespace wl { + namespace { + +@@ -76,6 +78,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 145c0137b59..f929b6ecffe 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/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 7f5289197bc..fc41f9a12f5 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 a9e72376987..9aaef1354f8 100644 +--- a/ui/ozone/platform/wayland/host/wayland_zaura_shell.cc ++++ b/ui/ozone/platform/wayland/host/wayland_zaura_shell.cc +@@ -18,7 +18,8 @@ + namespace ui { + + namespace { +-constexpr uint32_t kMaxAuraShellVersion = 24; ++constexpr uint32_t kMinVersion = 1; ++constexpr uint32_t kMaxVersion = 24; + } + + // static +@@ -32,11 +33,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 d7b8201c173e07b0e2bd1f9ad829c8f4fe81a7a3 Mon Sep 17 00:00:00 2001 +From: Alexander Dunaev <adun...@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 <toniki...@igalia.com> +Commit-Queue: Alexander Dunaev <adun...@igalia.com> +Auto-Submit: Alexander Dunaev <adun...@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; + } +