Changeset 285802 in webkit

Timestamp:

Nov 15, 2021, 4:57:16 AM (5 years ago)

Author:

eocanha@igalia.com

Message:

[GTK] webaudio/silent-audio-interrupted-in-background.html is a flaky timeout
​https://bugs.webkit.org/show_bug.cgi?id=229964

Reviewed by Carlos Garcia Campos.

Source/WebCore:

I can't reproduce the timeout locally anymore, but I'm getting a crash sometimes. This fix is for the crash.
Unregister dbus objects on MediaSessionGLib destruction to prevent the dbus connection to keep processing requests.

• platform/audio/glib/MediaSessionGLib.cpp:

(WebCore::MediaSessionGLib::MediaSessionGLib()): Don't register a GBusNameLostCallback, as unregistration is now going to be handled in the destructor.
(WebCore::MediaSessionGLib::~MediaSessionGLib()): Unregister dbus objects.
(WebCore::MediaSessionGLib::nameLost()): Refactored into the destructor.

• platform/audio/glib/MediaSessionGLib.h:

(WebCore::MediaSessionGLib::nameLost()): Deleted.

LayoutTests:

Removed failing test from TestExpectations.

• platform/gtk/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/audio/glib/MediaSessionGLib.cpp (modified) (1 diff)
• Source/WebCore/platform/audio/glib/MediaSessionGLib.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-11-15  Enrique Ocaña González  <eocanha@igalia.com>
+
+        [GTK] webaudio/silent-audio-interrupted-in-background.html is a flaky timeout
+        https://bugs.webkit.org/show_bug.cgi?id=229964
+
+        Reviewed by Carlos Garcia Campos.
+
+        Removed failing test from TestExpectations.
+
+        * platform/gtk/TestExpectations:
+
 2021-11-15  Antti Koivisto  <antti@apple.com>
 

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -1248 +1248 @@
 webkit.org/b/229268 media/media-fragments/TC0009.html [ Failure Pass ]
 webkit.org/b/229268 media/media-fragments/TC0014.html [ Failure Pass ]
-
-webkit.org/b/229964 webaudio/silent-audio-interrupted-in-background.html [ Pass Timeout ]
 
 # Flaky on skip-failing-test bot (EWS)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-15  Enrique Ocaña González  <eocanha@igalia.com>
+
+        [GTK] webaudio/silent-audio-interrupted-in-background.html is a flaky timeout
+        https://bugs.webkit.org/show_bug.cgi?id=229964
+
+        Reviewed by Carlos Garcia Campos.
+
+        I can't reproduce the timeout locally anymore, but I'm getting a crash sometimes. This fix is for the crash.
+        Unregister dbus objects on MediaSessionGLib destruction to prevent the dbus connection to keep processing requests.
+
+        * platform/audio/glib/MediaSessionGLib.cpp:
+        (WebCore::MediaSessionGLib::MediaSessionGLib()): Don't register a GBusNameLostCallback, as unregistration is now going to be handled in the destructor.
+        (WebCore::MediaSessionGLib::~MediaSessionGLib()): Unregister dbus objects.
+        (WebCore::MediaSessionGLib::nameLost()): Refactored into the destructor.
+        * platform/audio/glib/MediaSessionGLib.h:
+        (WebCore::MediaSessionGLib::nameLost()): Deleted.
+
 2021-11-15  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/platform/audio/glib/MediaSessionGLib.cpp

@@ -219 +219 @@
     m_instanceId = applicationID.isEmpty() ? makeString("org.mpris.MediaPlayer2.webkit.instance", getpid(), "-", identifier.toUInt64()) : makeString("org.mpris.MediaPlayer2.", applicationID.ascii().data(), "-", identifier.toUInt64());
 
-    m_ownerId = g_bus_own_name_on_connection(m_connection.get(), m_instanceId.ascii().data(), G_BUS_NAME_OWNER_FLAGS_NONE, nullptr,
-        reinterpret_cast<GBusNameLostCallback>(+[](GDBusConnection* connection, const char*, gpointer userData) {
-            auto& session = *reinterpret_cast<MediaSessionGLib*>(userData);
-            session.nameLost(connection);
-        }), this, nullptr);
+    m_ownerId = g_bus_own_name_on_connection(m_connection.get(), m_instanceId.ascii().data(), G_BUS_NAME_OWNER_FLAGS_NONE, nullptr, nullptr, this, nullptr);
 }
 
 MediaSessionGLib::~MediaSessionGLib()
 {
+    if (m_connection) {
+        if (m_rootRegistrationId && !g_dbus_connection_unregister_object(m_connection.get(), m_rootRegistrationId))
+            g_warning("Unable to unregister MPRIS D-Bus object.");
+        if (m_playerRegistrationId && !g_dbus_connection_unregister_object(m_connection.get(), m_playerRegistrationId))
+            g_warning("Unable to unregister MPRIS D-Bus player object.");
+    }
     if (m_ownerId)
         g_bus_unown_name(m_ownerId);
-}
-
-void MediaSessionGLib::nameLost(GDBusConnection* connection)
-{
-    if (UNLIKELY(!m_connection)) {
-        g_warning("Unable to acquire MPRIS D-Bus session ownership for name %s", m_instanceId.ascii().data());
-        return;
-    }
-
-    m_connection = nullptr;
-    if (!m_rootRegistrationId)
-        return;
-
-    if (g_dbus_connection_unregister_object(connection, m_rootRegistrationId))
-        m_rootRegistrationId = 0;
-    else
-        g_warning("Unable to unregister MPRIS D-Bus object.");
-
-    if (!m_playerRegistrationId)
-        return;
-
-    if (g_dbus_connection_unregister_object(connection, m_playerRegistrationId))
-        m_playerRegistrationId = 0;
-    else
-        g_warning("Unable to unregister MPRIS D-Bus player object.");
 }
 

trunk/Source/WebCore/platform/audio/glib/MediaSessionGLib.h

@@ -45 +45 @@
     GVariant* canSeekAsGVariant();
 
-    void nameLost(GDBusConnection*);
     void emitPositionChanged(double time);
     void updateNowPlaying(NowPlayingInfo&);