Changeset 176476 in webkit

Timestamp:

Nov 21, 2014, 3:29:08 PM (12 years ago)

Author:

jer.noble@apple.com

Message:

[Mac] Random crashes inside media libraries when creating then destroying media quickly.
​https://bugs.webkit.org/show_bug.cgi?id=138980

Reviewed by Eric Carlson.

Speculative fix for random crashes in the layout tests which occur randomly but regularly. The theory is
that creating-then-destroying our media objects too quickly triggers crashes deep within the media frameworks
when their initialization threads don't have a chance to complete before the main player object is destroyed.
Test out this theory by delaying the destruction of the AVPlayer object for 1s after its owner is destroyed.

• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:

(WebCore::MediaPlayerPrivateAVFoundationObjC::cancelLoad):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-21  Jer Noble  <jer.noble@apple.com>
+
+        [Mac] Random crashes inside media libraries when creating then destroying media quickly.
+        https://bugs.webkit.org/show_bug.cgi?id=138980
+
+        Reviewed by Eric Carlson.
+
+        Speculative fix for random crashes in the layout tests which occur randomly but regularly. The theory is
+        that creating-then-destroying our media objects too quickly triggers crashes deep within the media frameworks
+        when their initialization threads don't have a chance to complete before the main player object is destroyed.
+        Test out this theory by delaying the destruction of the AVPlayer object for 1s after its owner is destroyed.
+
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::cancelLoad):
+
 2014-11-21  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

@@ -497 +497 @@
         [m_avPlayer.get() removeObserver:m_objcObserver.get() forKeyPath:@"externalPlaybackActive"];
 #endif
-        m_avPlayer = nil;
+        
+        RetainPtr<AVPlayerType> strongPlayer = WTF::move(m_avPlayer);
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 1 * NSEC_PER_SEC), dispatch_get_main_queue(), [strongPlayer] () mutable {
+            strongPlayer.clear();
+        });
     }