Merge ~b-stolk/chromium-browser/+git/snap-from-source:hwacc-dev into ~chromium-team/chromium-browser/+git/snap-from-source:hwacc-dev

[Bram Stolk]

This uses the proper syntax for the --enable-hardware-overlays flag.

The syntax changed four years ago.
See: https://codereview.chromium.org/2657633002

[Nathan Teodosio (nteodosio)]

review: Approve

diff --git a/launcher/chromium.launcher b/launcher/chromium.launcher
index d450839..fd3fe67 100755
--- a/launcher/chromium.launcher
+++ b/launcher/chromium.launcher
@@ -111,7 +111,11 @@ if [ $WANT_HEADLESS -eq 0 ] ; then
 fi
 
 # Add necessary flags for VAAPI video en/decoding
+<<<<<<< launcher/chromium.launcher
 CHROMIUM_VAAPI_FLAGS='--enable-features=VaapiVideoDecoder,VaapiVideoEncoder --disable-features=UseChromeOSDirectVideoDecoder --enable-hardware-overlays="" --video-capture-use-gpu-memory-buffer --use-gl=egl --video-capture-use-external-dma-buffer'
+=======
+CHROMIUM_VAAPI_FLAGS='--enable-features=VaapiVideoDecoder,VaapiVideoEncoder --disable-features=UseChromeOSDirectVideoDecoder --video-capture-use-gpu-memory-buffer --use-gl=egl --video-capture-use-external-dma-buffer'
+>>>>>>> launcher/chromium.launcher
 
 if [ -n "$WAYLAND_DISPLAY" ]; then
     CHROMIUM_VAAPI_FLAGS="--ozone-platform=wayland $CHROMIUM_VAAPI_FLAGS"
@@ -119,6 +123,8 @@ fi
 
 CHROMIUM_FLAGS="--disable-features=TFLiteLanguageDetectionEnabled $CHROMIUM_FLAGS"
 
+CHROMIUM_FLAGS="--enable-hardware-overlays=single-fullscreen,single-on-top,underlay $CHROMIUM_FLAGS"
+
 if [ $WANT_TEMP_PROFILE -eq 0 ] ; then
   exec "$SNAP/usr/lib/chromium-browser/chrome" --password-store=$PASSWORD_STORE $CHROMIUM_VAAPI_FLAGS $CHROMIUM_FLAGS "$@"
 else