diff options
author | Jose Dapena Paz <jdapena@igalia.com> | 2022-01-21 19:18:44 +0100 |
---|---|---|
committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2022-02-01 21:51:01 +0000 |
commit | c0c3c0f73d420aa91f884b62b12442bc876c889d (patch) | |
tree | 6ee21e52abd7ddbb61a99b8ac5039470cfd1738d /recipes-wam/chromium/files/add-a-delay-to-agl-ready-event.patch | |
parent | ffc37508aa41fadf11dfabd34f7a8d4aa16e06b7 (diff) |
chromium*, wam: fix systemd launching from systemd
Instead of providing a SMACK aware system service for WAM per
session instance, provide a systemd user service depending on the
new services in Marlin.
Update the chromium84 and wam heads to include the required changes.
We also remove the patches applied from recipe, so they belong to
the chromium tree now.
chromium84: 3d6fd5dd0b..4a320225eb
4a320225eb [op][agl][wayland] Take into account wayland output transform
13d93f6dae [op][agl][wayland] Do not bind agl_shell by default.
ca47b4fd0a [skia][build] fix skia no_sanitize build issues for gcc
3b7541e3cf GCC: supress invalid-offsetof warning
6cd04072fb Add a delay to agl ready event
wam: 935be6b..8607609
8607609 [op][agl][wayland] UiSize should be system resolution.
fcfeb67 [op][agl] Allow to run web applications in new application framework.
Bug-AGL: SPEC-4223
Change-Id: Ie0bc3dd6878920a0ba1bfac4f32814a23e4d41e7
Signed-off-by: Jose Dapena Paz <jdapena@igalia.com>
Diffstat (limited to 'recipes-wam/chromium/files/add-a-delay-to-agl-ready-event.patch')
-rw-r--r-- | recipes-wam/chromium/files/add-a-delay-to-agl-ready-event.patch | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/recipes-wam/chromium/files/add-a-delay-to-agl-ready-event.patch b/recipes-wam/chromium/files/add-a-delay-to-agl-ready-event.patch deleted file mode 100644 index 20caccbf6..000000000 --- a/recipes-wam/chromium/files/add-a-delay-to-agl-ready-event.patch +++ /dev/null @@ -1,70 +0,0 @@ -From d2d09d3e13a3874961971d343553106a1f3d5ac7 Mon Sep 17 00:00:00 2001 -From: Roger Zanoni <rzanoni@igalia.com> -Date: Thu, 3 Jun 2021 10:53:40 +0200 -Subject: [PATCH] Add a delay to agl ready event - -Delay ready() to ensure that all the window and surfaces setup -is done before notifying the compositor ---- - .../ozone/platform/wayland/host/wayland_window.cc | 14 +++++++++++++- - .../ozone/platform/wayland/host/wayland_window.h | 5 +++++ - 2 files changed, 18 insertions(+), 1 deletion(-) - -diff --git a/src/ui/ozone/platform/wayland/host/wayland_window.cc b/src/ui/ozone/platform/wayland/host/wayland_window.cc -index d2a9b0dae5..27749fd70d 100644 ---- a/src/ui/ozone/platform/wayland/host/wayland_window.cc -+++ b/src/ui/ozone/platform/wayland/host/wayland_window.cc -@@ -299,7 +299,19 @@ WaylandWindow::SetAglReady(void) - if (!connection_->agl_shell_manager) { - return; - } -- connection_->agl_shell_manager->ready(); -+ -+ // Delay activation to ensure that all the setup is done -+ // TODO(rzanoni): find a more deterministic way of doing this -+ set_ready_timer_.Start(FROM_HERE, -+ base::TimeDelta::FromMilliseconds(500), -+ this, -+ &WaylandWindow::SetReadyCallback); -+} -+ -+ -+void WaylandWindow::SetReadyCallback() { -+ connection_->agl_shell_manager->ready(); -+ connection_->ScheduleFlush(); - } - - bool WaylandWindow::CanDispatchEvent(const PlatformEvent& event) { -diff --git a/src/ui/ozone/platform/wayland/host/wayland_window.h b/src/ui/ozone/platform/wayland/host/wayland_window.h -index 2acac98ae9..c10db38d21 100644 ---- a/src/ui/ozone/platform/wayland/host/wayland_window.h -+++ b/src/ui/ozone/platform/wayland/host/wayland_window.h -@@ -15,6 +15,7 @@ - #include "base/containers/flat_set.h" - #include "base/gtest_prod_util.h" - #include "base/memory/ref_counted.h" -+#include "base/timer/timer.h" - #include "ui/events/platform/platform_event_dispatcher.h" - #include "ui/gfx/geometry/rect.h" - #include "ui/gfx/native_widget_types.h" -@@ -232,6 +233,8 @@ class WaylandWindow : public PlatformWindow, public PlatformEventDispatcher { - // Returns a root parent window. - WaylandWindow* GetRootParentWindow(); - -+ void SetReadyCallback(); -+ - // Install a surface listener and start getting wl_output enter/leave events. - void AddSurfaceListener(); - -@@ -311,6 +314,8 @@ class WaylandWindow : public PlatformWindow, public PlatformEventDispatcher { - // The type of the current WaylandWindow object. - ui::PlatformWindowType type_ = ui::PlatformWindowType::kWindow; - -+ base::OneShotTimer set_ready_timer_; -+ - DISALLOW_COPY_AND_ASSIGN(WaylandWindow); - }; - --- -2.32.0 - |