diff options
Diffstat (limited to 'www-client/chromium/files')
| -rw-r--r-- | www-client/chromium/files/chromium-87-xproto-crash.patch | 38 | ||||
| -rw-r--r-- | www-client/chromium/files/chromium-launcher-r5.sh | 56 |
2 files changed, 0 insertions, 94 deletions
diff --git a/www-client/chromium/files/chromium-87-xproto-crash.patch b/www-client/chromium/files/chromium-87-xproto-crash.patch deleted file mode 100644 index d0dc391e8f10..000000000000 --- a/www-client/chromium/files/chromium-87-xproto-crash.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 6e50c5a3abfa22eb17e26086bffbee288d07483e Mon Sep 17 00:00:00 2001 -From: Tom Anderson <thomasanderson@chromium.org> -Date: Thu, 22 Oct 2020 01:05:44 +0000 -Subject: [PATCH] [XProto] Fix crash in media::UserInputMonitorLinuxCore::DispatchXEvent - -The X server may send unsolicited events (from clients calling -XSendEvent() or from new keyboard mappings). So we must check that -the event is the correct type before dispatching it. - -R=dalecurtis - -Change-Id: Ic3e19f7da1415c358991609c9b016bd60ead2038 -Bug: 1140927 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2490674 -Commit-Queue: Thomas Anderson <thomasanderson@chromium.org> -Auto-Submit: Thomas Anderson <thomasanderson@chromium.org> -Reviewed-by: Dale Curtis <dalecurtis@chromium.org> -Cr-Commit-Position: refs/heads/master@{#819650} ---- - -diff --git a/media/base/user_input_monitor_linux.cc b/media/base/user_input_monitor_linux.cc -index 59e655f..13c373f 100644 ---- a/media/base/user_input_monitor_linux.cc -+++ b/media/base/user_input_monitor_linux.cc -@@ -115,9 +115,10 @@ - DCHECK(io_task_runner_->BelongsToCurrentThread()); - - auto* raw = event->As<x11::Input::RawDeviceEvent>(); -- DCHECK(raw); -- DCHECK(raw->opcode == x11::Input::RawDeviceEvent::RawKeyPress || -- raw->opcode == x11::Input::RawDeviceEvent::RawKeyRelease); -+ if (!raw || (raw->opcode != x11::Input::RawDeviceEvent::RawKeyPress && -+ raw->opcode != x11::Input::RawDeviceEvent::RawKeyRelease)) { -+ return; -+ } - - ui::EventType type = raw->opcode == x11::Input::RawDeviceEvent::RawKeyPress - ? ui::ET_KEY_PRESSED diff --git a/www-client/chromium/files/chromium-launcher-r5.sh b/www-client/chromium/files/chromium-launcher-r5.sh deleted file mode 100644 index d9aa3af9a057..000000000000 --- a/www-client/chromium/files/chromium-launcher-r5.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/bash - -# Allow the user to override command-line flags, bug #357629. -# This is based on Debian's chromium-browser package, and is intended -# to be consistent with Debian. -for f in /etc/chromium/*; do - [[ -f ${f} ]] && source "${f}" -done - -# Prefer user defined CHROMIUM_USER_FLAGS (from env) over system -# default CHROMIUM_FLAGS (from /etc/chromium/default). -CHROMIUM_FLAGS=${CHROMIUM_USER_FLAGS:-"$CHROMIUM_FLAGS"} - -# Let the wrapped binary know that it has been run through the wrapper -export CHROME_WRAPPER=$(readlink -f "$0") - -PROGDIR=${CHROME_WRAPPER%/*} - -case ":$PATH:" in - *:$PROGDIR:*) - # $PATH already contains $PROGDIR - ;; - *) - # Append $PROGDIR to $PATH - export PATH="$PATH:$PROGDIR" - ;; -esac - -if [[ ${EUID} == 0 && -O ${XDG_CONFIG_HOME:-${HOME}} ]]; then - # Running as root with HOME owned by root. - # Pass --user-data-dir to work around upstream failsafe. - CHROMIUM_FLAGS="--user-data-dir=${XDG_CONFIG_HOME:-${HOME}/.config}/chromium - ${CHROMIUM_FLAGS}" -fi - -# Select session type -if @@OZONE_AUTO_SESSION@@; then - platform= - if [[ ${XDG_SESSION_TYPE} == x11 ]]; then - platform=x11 - elif [[ ${XDG_SESSION_TYPE} == wayland ]]; then - platform=wayland - else - if [[ -n ${WAYLAND_DISPLAY} ]]; then - platform=wayland - else - platform=x11 - fi - fi - CHROMIUM_FLAGS="--ozone-platform=${platform} ${CHROMIUM_FLAGS}" -fi - -# Set the .desktop file name -export CHROME_DESKTOP="chromium-browser-chromium.desktop" - -exec -a "chromium-browser" "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins ${CHROMIUM_FLAGS} "$@" |