77.0.3865.90-1

8 files changed, 89 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d5034a8a31c1..cfffcb95fc43 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = chromium-ozone
 	pkgdesc = Chromium built with patches for wayland support via Ozone
-	pkgver = 77.0.3865.75
+	pkgver = 77.0.3865.90
 	pkgrel = 1
 	url = https://www.chromium.org/Home
 	install = chromium.install
@@ -57,7 +57,7 @@ pkgbase = chromium-ozone
 	conflicts = chromium
 	options = debug
 	options = !strip
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-77.0.3865.75.tar.xz
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-77.0.3865.90.tar.xz
 	source = chromium-launcher-6.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v6.tar.gz
 	source = meta-browser-38b36f421f8d984c7004c9d9a6d514ed2fb6cf8e.tar.gz::https://github.com/OSSystems/meta-browser/archive/38b36f421f8d984c7004c9d9a6d514ed2fb6cf8e.tar.gz
 	source = include-memory-in-one_euro_filter.h.patch
@@ -73,7 +73,8 @@ pkgbase = chromium-ozone
 	source = 0003-ozone-wayland-Stop-using-wl_display_roundtrip.patch
 	source = 0004-ozone-wayland-Extract-window-management-methods-to-o.patch
 	source = 0005-ozone-wayland-Do-not-use-possibly-blocking-dispatch-.patch
-	sha256sums = eb952ff241e719cbdcc2aae1832ecc1dd2263736ab38ee1dbf88ac9120119789
+	source = 0006-ozone-wayland-Implement-CreateNativePixmapAsync.patch
+	sha256sums = 004cfdb1df74847bea8659bcaf8e039d51fe1101d42b6cf1c6cc346073fdefc3
 	sha256sums = 04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1
 	sha256sums = d87957d01be9fb59faf5fde523eb87a8256605b1533171416b7a56bfcbd6d056
 	sha256sums = 33a5bcd1df2cc7aa7467fa882790ef143a4497d2b704c9e1ea86c8ede90c2d90
@@ -84,11 +85,12 @@ pkgbase = chromium-ozone
 	sha256sums = 0f7ba6882844542a7226b419dfefc5b6a16b5b7882698bd773b5ee9148aa6e87
 	sha256sums = d081f2ef8793544685aad35dea75a7e6264a2cb987ff3541e6377f4a3650a28b
 	sha256sums = 771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1
-	sha256sums = 333a4ecac50f1f2a2545132dc97bd22ccb1a0623bd5a5d86487327e8ee6fde3d
-	sha256sums = 5d1e93f1930a53d2cee7d7cff94b4aba3a91dc15e13f667ce56956b2d08222cc
-	sha256sums = 19dc0c5b521ad252b75a42cad254ced431f790bb71d1c048eb748a65e29aeb69
-	sha256sums = d0ed9879427db1412b679c2ab0ff4da83698f6dfe389080d272ec85716478b43
-	sha256sums = 465dbcefbe8b01d242491bb527da8ecb466654262162b9bdc96bbf13ee8b864f
+	sha256sums = f22ee87b16f9b06acd1f37081fbb24fb442a5c90278416f67dcd5bc6e0e93e02
+	sha256sums = d6a03dfc515df07da8172adec53d77b161b41d0a541193a94319e814bbe564b0
+	sha256sums = 25b9a7ee019db07b5870b2933d112ddd51faf6412b22a6eaa5457c2d3da485c3
+	sha256sums = 3d85dd53a412f1d7bda4f4be092ac8dab19c623c6510b9b34e0e6010bf3b67a4
+	sha256sums = a6cafead21891ebe24cc9535d4d83edba1794830a4aeebebccd9a7f6c036a15c
+	sha256sums = f89da9c31ef6bf900535e71272791e27a1977d215424cb6eb79e8c1f8f94dceb
 
 pkgname = chromium-ozone
 
diff --git a/0001-ozone-wayland-Sway-avoid-sending-presentation-early.patch b/0001-ozone-wayland-Sway-avoid-sending-presentation-early.patch
index 9b4c074dab49..dcdb2c9d4014 100644
--- a/0001-ozone-wayland-Sway-avoid-sending-presentation-early.patch
+++ b/0001-ozone-wayland-Sway-avoid-sending-presentation-early.patch
@@ -1,4 +1,4 @@
-From a8202f907f739a2e68e401d3e36136270bd6fc7a Mon Sep 17 00:00:00 2001
+From 49c3fba35163f665a5e6ccdb5403dcfee8d7e626 Mon Sep 17 00:00:00 2001
 From: Maksim Sisov <msisov@igalia.com>
 Date: Tue, 30 Jul 2019 05:53:48 +0000
 Subject: [PATCH 1/6] [ozone/wayland] Sway: avoid sending presentation early.
diff --git a/0002-ozone-wayland-Use-mutex-before-accessing-surfaces-ma.patch b/0002-ozone-wayland-Use-mutex-before-accessing-surfaces-ma.patch
index 7bb3d35002fb..a660c5b87f7f 100644
--- a/0002-ozone-wayland-Use-mutex-before-accessing-surfaces-ma.patch
+++ b/0002-ozone-wayland-Use-mutex-before-accessing-surfaces-ma.patch
@@ -1,4 +1,4 @@
-From 296c7b4e9935aaed1d05d32416043a03f67e268d Mon Sep 17 00:00:00 2001
+From db0fa61b59ab9cb131c3e9167fad1529f951e492 Mon Sep 17 00:00:00 2001
 From: Maksim Sisov <msisov@igalia.com>
 Date: Mon, 5 Aug 2019 16:14:47 +0300
 Subject: [PATCH 2/6] [ozone/wayland] Use mutex before accessing surfaces map.
diff --git a/0003-ozone-wayland-Stop-using-wl_display_roundtrip.patch b/0003-ozone-wayland-Stop-using-wl_display_roundtrip.patch
index 5ccac7e792a7..6c6c49a70e59 100644
--- a/0003-ozone-wayland-Stop-using-wl_display_roundtrip.patch
+++ b/0003-ozone-wayland-Stop-using-wl_display_roundtrip.patch
@@ -1,4 +1,4 @@
-From e58ed0f56e9ffbee6222b9b8b3f62be4acde72ac Mon Sep 17 00:00:00 2001
+From 37571af91e60eb9b4514cffbc475f41f58face01 Mon Sep 17 00:00:00 2001
 From: Maksim Sisov <msisov@igalia.com>
 Date: Thu, 8 Aug 2019 11:32:57 +0000
 Subject: [PATCH 3/6] [ozone/wayland] Stop using wl_display_roundtrip
diff --git a/0004-ozone-wayland-Extract-window-management-methods-to-o.patch b/0004-ozone-wayland-Extract-window-management-methods-to-o.patch
index 122ec9a81797..fbd22d392ebf 100644
--- a/0004-ozone-wayland-Extract-window-management-methods-to-o.patch
+++ b/0004-ozone-wayland-Extract-window-management-methods-to-o.patch
@@ -1,4 +1,4 @@
-From 1a25d1eb6a0a38f27d62f3d872079156e3542d62 Mon Sep 17 00:00:00 2001
+From 865e16ef4709771d15e9250f0aa7d9c711c4018e Mon Sep 17 00:00:00 2001
 From: Maksim Sisov <msisov@igalia.com>
 Date: Fri, 26 Jul 2019 04:56:22 +0000
 Subject: [PATCH 4/6] [ozone/wayland]: Extract window management methods to own
diff --git a/0005-ozone-wayland-Do-not-use-possibly-blocking-dispatch-.patch b/0005-ozone-wayland-Do-not-use-possibly-blocking-dispatch-.patch
index 01c0d8d2a510..92a95e78ba62 100644
--- a/0005-ozone-wayland-Do-not-use-possibly-blocking-dispatch-.patch
+++ b/0005-ozone-wayland-Do-not-use-possibly-blocking-dispatch-.patch
@@ -1,4 +1,4 @@
-From 3ab4f4ab9266f273b5846a518f9a50c3c455ae78 Mon Sep 17 00:00:00 2001
+From ae8d566f4048db9fff5208b5f007116eee92f289 Mon Sep 17 00:00:00 2001
 From: Maksim Sisov <msisov@igalia.com>
 Date: Thu, 8 Aug 2019 11:47:41 +0000
 Subject: [PATCH 5/6] [ozone/wayland] Do not use possibly blocking dispatch API
diff --git a/0006-ozone-wayland-Implement-CreateNativePixmapAsync.patch b/0006-ozone-wayland-Implement-CreateNativePixmapAsync.patch
new file mode 100644
index 000000000000..e6d9b38cc74f
--- /dev/null
+++ b/0006-ozone-wayland-Implement-CreateNativePixmapAsync.patch
@@ -0,0 +1,63 @@
+From 5543ce4044356138c590f1602c25bcd7cdd98169 Mon Sep 17 00:00:00 2001
+From: Maksim Sisov <msisov@igalia.com>
+Date: Thu, 1 Aug 2019 08:22:39 +0000
+Subject: [PATCH 6/6] [ozone/wayland] Implement CreateNativePixmapAsync
+
+Fix native GpuMemoryBuffers for Ozone/Wayland by implementing
+non implemented CreateNativePixmapAsync call.
+
+Bug: 989433
+Change-Id: Ic178ac2d4f0716e4c4a00a0abb6686e64b980b90
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1728655
+Reviewed-by: Robert Kroeger <rjkroege@chromium.org>
+Commit-Queue: Maksim Sisov <msisov@igalia.com>
+Cr-Commit-Position: refs/heads/master@{#683102}
+---
+ .../platform/wayland/gpu/wayland_surface_factory.cc | 13 +++++++++++++
+ .../platform/wayland/gpu/wayland_surface_factory.h  |  6 ++++++
+ 2 files changed, 19 insertions(+)
+
+diff --git a/ui/ozone/platform/wayland/gpu/wayland_surface_factory.cc b/ui/ozone/platform/wayland/gpu/wayland_surface_factory.cc
+index a5db42ef1b18..789488397808 100644
+--- a/ui/ozone/platform/wayland/gpu/wayland_surface_factory.cc
++++ b/ui/ozone/platform/wayland/gpu/wayland_surface_factory.cc
+@@ -170,6 +170,19 @@ scoped_refptr<gfx::NativePixmap> WaylandSurfaceFactory::CreateNativePixmap(
+ #endif
+ }
+ 
++void WaylandSurfaceFactory::CreateNativePixmapAsync(
++    gfx::AcceleratedWidget widget,
++    VkDevice vk_device,
++    gfx::Size size,
++    gfx::BufferFormat format,
++    gfx::BufferUsage usage,
++    NativePixmapCallback callback) {
++  // CreateNativePixmap is non-blocking operation. Thus, it is safe to call it
++  // and return the result with the provided callback.
++  std::move(callback).Run(
++      CreateNativePixmap(widget, vk_device, size, format, usage));
++}
++
+ scoped_refptr<gfx::NativePixmap>
+ WaylandSurfaceFactory::CreateNativePixmapFromHandle(
+     gfx::AcceleratedWidget widget,
+diff --git a/ui/ozone/platform/wayland/gpu/wayland_surface_factory.h b/ui/ozone/platform/wayland/gpu/wayland_surface_factory.h
+index 23f4f92a5959..53545ed9a328 100644
+--- a/ui/ozone/platform/wayland/gpu/wayland_surface_factory.h
++++ b/ui/ozone/platform/wayland/gpu/wayland_surface_factory.h
+@@ -37,6 +37,12 @@ class WaylandSurfaceFactory : public SurfaceFactoryOzone {
+       gfx::Size size,
+       gfx::BufferFormat format,
+       gfx::BufferUsage usage) override;
++  void CreateNativePixmapAsync(gfx::AcceleratedWidget widget,
++                               VkDevice vk_device,
++                               gfx::Size size,
++                               gfx::BufferFormat format,
++                               gfx::BufferUsage usage,
++                               NativePixmapCallback callback) override;
+   scoped_refptr<gfx::NativePixmap> CreateNativePixmapFromHandle(
+       gfx::AcceleratedWidget widget,
+       gfx::Size size,
+-- 
+2.23.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 9b8b8cc41a51..0f3e0f73a4c9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=chromium-ozone
-pkgver=77.0.3865.75
+pkgver=77.0.3865.90
 pkgrel=1
 _launcher_ver=6
 _meta_browser_sha=38b36f421f8d984c7004c9d9a6d514ed2fb6cf8e
@@ -41,8 +41,9 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom
         0002-ozone-wayland-Use-mutex-before-accessing-surfaces-ma.patch
         0003-ozone-wayland-Stop-using-wl_display_roundtrip.patch
         0004-ozone-wayland-Extract-window-management-methods-to-o.patch
-        0005-ozone-wayland-Do-not-use-possibly-blocking-dispatch-.patch)
-sha256sums=('eb952ff241e719cbdcc2aae1832ecc1dd2263736ab38ee1dbf88ac9120119789'
+        0005-ozone-wayland-Do-not-use-possibly-blocking-dispatch-.patch
+        0006-ozone-wayland-Implement-CreateNativePixmapAsync.patch)
+sha256sums=('004cfdb1df74847bea8659bcaf8e039d51fe1101d42b6cf1c6cc346073fdefc3'
             '04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1'
             'd87957d01be9fb59faf5fde523eb87a8256605b1533171416b7a56bfcbd6d056'
             '33a5bcd1df2cc7aa7467fa882790ef143a4497d2b704c9e1ea86c8ede90c2d90'
@@ -53,11 +54,12 @@ sha256sums=('eb952ff241e719cbdcc2aae1832ecc1dd2263736ab38ee1dbf88ac9120119789'
             '0f7ba6882844542a7226b419dfefc5b6a16b5b7882698bd773b5ee9148aa6e87'
             'd081f2ef8793544685aad35dea75a7e6264a2cb987ff3541e6377f4a3650a28b'
             '771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1'
-            '333a4ecac50f1f2a2545132dc97bd22ccb1a0623bd5a5d86487327e8ee6fde3d'
-            '5d1e93f1930a53d2cee7d7cff94b4aba3a91dc15e13f667ce56956b2d08222cc'
-            '19dc0c5b521ad252b75a42cad254ced431f790bb71d1c048eb748a65e29aeb69'
-            'd0ed9879427db1412b679c2ab0ff4da83698f6dfe389080d272ec85716478b43'
-            '465dbcefbe8b01d242491bb527da8ecb466654262162b9bdc96bbf13ee8b864f')
+            'f22ee87b16f9b06acd1f37081fbb24fb442a5c90278416f67dcd5bc6e0e93e02'
+            'd6a03dfc515df07da8172adec53d77b161b41d0a541193a94319e814bbe564b0'
+            '25b9a7ee019db07b5870b2933d112ddd51faf6412b22a6eaa5457c2d3da485c3'
+            '3d85dd53a412f1d7bda4f4be092ac8dab19c623c6510b9b34e0e6010bf3b67a4'
+            'a6cafead21891ebe24cc9535d4d83edba1794830a4aeebebccd9a7f6c036a15c'
+            'f89da9c31ef6bf900535e71272791e27a1977d215424cb6eb79e8c1f8f94dceb')
 
 # Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
 # Keys are the names in the above script; values are the dependencies in Arch
@@ -107,6 +109,7 @@ _bugfix_patches=(
   '0003-ozone-wayland-Stop-using-wl_display_roundtrip.patch'
   '0004-ozone-wayland-Extract-window-management-methods-to-o.patch'
   '0005-ozone-wayland-Do-not-use-possibly-blocking-dispatch-.patch'
+  '0006-ozone-wayland-Implement-CreateNativePixmapAsync.patch'
 )
 
 prepare() {