Changeset 249276 in webkit

Timestamp:

Aug 29, 2019, 9:14:07 AM (7 years ago)

Author:

cturner@igalia.com

Message:

[GStreamer] Do not use makeWeakPtr from streaming thread.
​https://bugs.webkit.org/show_bug.cgi?id=201220

Reviewed by Xabier Rodriguez-Calvar.

Test: imported/w3c/web-platform-tests/encrypted-media/clearkey-mp4-playback-retrieve-persistent-license.https.html

Recently some asserts were added that you can't create WeakPtr's
from streaming threads when the factory is created on the
main-thread. The fix is to eagerly create the WeakPtr at player
initialization time, rather than lazily when the streaming thread
first asks for it.

• platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-29  Charlie Turner  <cturner@igalia.com>
+
+        [GStreamer] Do not use makeWeakPtr from streaming thread.
+        https://bugs.webkit.org/show_bug.cgi?id=201220
+
+        Reviewed by Xabier Rodriguez-Calvar.
+
+        Test: imported/w3c/web-platform-tests/encrypted-media/clearkey-mp4-playback-retrieve-persistent-license.https.html
+
+        Recently some asserts were added that you can't create WeakPtr's
+        from streaming threads when the factory is created on the
+        main-thread. The fix is to eagerly create the WeakPtr at player
+        initialization time, rather than lazily when the streaming thread
+        first asks for it.
+
+        * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
+
 2019-08-29  Rob Buis  <rbuis@igalia.com>
 

trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h

@@ -89 +89 @@
 void registerWebKitGStreamerElements();
 
-class MediaPlayerPrivateGStreamerBase : public MediaPlayerPrivateInterface, public CanMakeWeakPtr<MediaPlayerPrivateGStreamerBase>
+// Use eager initialization for the WeakPtrFactory since we call makeWeakPtr() from another thread.
+class MediaPlayerPrivateGStreamerBase : public MediaPlayerPrivateInterface, public CanMakeWeakPtr<MediaPlayerPrivateGStreamerBase, WeakPtrFactoryInitialization::Eager>
 #if USE(TEXTURE_MAPPER_GL)
 #if USE(NICOSIA)