Modified: trunk/Source/WebCore/ChangeLog (162878 => 162879)
--- trunk/Source/WebCore/ChangeLog 2014-01-27 23:50:52 UTC (rev 162878)
+++ trunk/Source/WebCore/ChangeLog 2014-01-27 23:51:19 UTC (rev 162879)
@@ -1,3 +1,27 @@
+2014-01-27 Jer Noble <jer.no...@apple.com>
+
+ [iOS] Use callOnMainThread() not dispatch_async() in MediaPlayerPrivateAVFoundationObjC
+ https://bugs.webkit.org/show_bug.cgi?id=127701
+
+ Reviewed by Eric Carlson.
+
+ dispatch_async(dispatch_get_main_queue(), ...) used to be fine so long as the main
+ thread was also the web thread. But since that's not the case on iOS, we should be
+ using callOnMainThread() instead (because it dispatches to the web thread, not as
+ its name implies, the main thread).
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createWeakPtr):
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::MediaPlayerPrivateAVFoundationObjC):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createVideoLayer):
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::seekToTime):
+ (-[WebCoreAVFMovieObserver legibleOutput:didOutputAttributedStrings:nativeSampleBuffers:forItemTime:]):
+ (-[WebCoreAVFMovieObserver outputSequenceWasFlushed:]):
+ (-[WebCoreAVFLoaderDelegate resourceLoader:shouldWaitForLoadingOfRequestedResource:]):
+ (-[WebCoreAVFLoaderDelegate resourceLoader:shouldWaitForResponseToAuthenticationChallenge:]):
+ (-[WebCoreAVFLoaderDelegate resourceLoader:didCancelLoadingRequest:]):
+
2014-01-27 Maciej Stachowiak <m...@apple.com>
Move Conditional=BLOB from URL interface to Blob-related methods, to prepare for adding URL API
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (162878 => 162879)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2014-01-27 23:50:52 UTC (rev 162878)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h 2014-01-27 23:51:19 UTC (rev 162879)
@@ -116,6 +116,8 @@
private:
MediaPlayerPrivateAVFoundationObjC(MediaPlayer*);
+ WeakPtr<MediaPlayerPrivateAVFoundationObjC> createWeakPtr() { return m_weakPtrFactory.createWeakPtr(); }
+
// engine support
static PassOwnPtr<MediaPlayerPrivateInterface> create(MediaPlayer*);
static void getSupportedTypes(HashSet<String>& types);
@@ -215,6 +217,8 @@
void updateVideoTracks();
#endif
+ WeakPtrFactory<MediaPlayerPrivateAVFoundationObjC> m_weakPtrFactory;
+
RetainPtr<AVURLAsset> m_avAsset;
RetainPtr<AVPlayer> m_avPlayer;
RetainPtr<AVPlayerItem> m_avPlayerItem;
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (162878 => 162879)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-01-27 23:50:52 UTC (rev 162878)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2014-01-27 23:51:19 UTC (rev 162879)
@@ -274,6 +274,7 @@
MediaPlayerPrivateAVFoundationObjC::MediaPlayerPrivateAVFoundationObjC(MediaPlayer* player)
: MediaPlayerPrivateAVFoundation(player)
+ , m_weakPtrFactory(this)
, m_objcObserver(adoptNS([[WebCoreAVFMovieObserver alloc] initWithCallback:this]))
, m_videoFrameHasDrawn(false)
, m_haveCheckedPlayability(false)
@@ -426,7 +427,11 @@
if (!m_avPlayer || m_videoLayer)
return;
- callOnMainThread([this] {
+ auto weakThis = createWeakPtr();
+ callOnMainThread([this, weakThis] {
+ if (!weakThis)
+ return;
+
if (!m_avPlayer || m_videoLayer)
return;
@@ -693,10 +698,10 @@
CMTime cmBefore = CMTimeMakeWithSeconds(negativeTolerance, 600);
CMTime cmAfter = CMTimeMakeWithSeconds(positiveTolerance, 600);
- __block auto weakThis = createWeakPtr();
+ auto weakThis = createWeakPtr();
[m_avPlayerItem.get() seekToTime:cmTime toleranceBefore:cmBefore toleranceAfter:cmAfter completionHandler:^(BOOL finished) {
- dispatch_async(dispatch_get_main_queue(), ^{
+ callOnMainThread([weakThis, finished] {
auto _this = weakThis.get();
if (!_this)
return;
@@ -2029,10 +2034,13 @@
if (!m_callback)
return;
- dispatch_async(dispatch_get_main_queue(), ^{
- if (!m_callback)
+ RetainPtr<WebCoreAVFMovieObserver> strongSelf = self;
+ RetainPtr<NSArray> strongStrings = strings;
+ callOnMainThread([strongSelf, strongStrings, itemTime] {
+ MediaPlayerPrivateAVFoundationObjC* callback = strongSelf->m_callback;
+ if (!callback)
return;
- m_callback->processCue(strings, CMTimeGetSeconds(itemTime));
+ callback->processCue(strongStrings.get(), CMTimeGetSeconds(itemTime));
});
}
@@ -2043,10 +2051,10 @@
if (!m_callback)
return;
- dispatch_async(dispatch_get_main_queue(), ^{
- if (!m_callback)
- return;
- m_callback->flushCues();
+ RetainPtr<WebCoreAVFMovieObserver> strongSelf = self;
+ callOnMainThread([strongSelf] {
+ if (MediaPlayerPrivateAVFoundationObjC* callback = strongSelf->m_callback)
+ callback->flushCues();
});
}
#endif
@@ -2071,14 +2079,17 @@
if (!m_callback)
return NO;
- dispatch_async(dispatch_get_main_queue(), ^{
- if (!m_callback) {
- [loadingRequest finishLoadingWithError:nil];
+ RetainPtr<WebCoreAVFLoaderDelegate> strongSelf = self;
+ RetainPtr<AVAssetResourceLoadingRequest> strongRequest = loadingRequest;
+ callOnMainThread([strongSelf, strongRequest] {
+ MediaPlayerPrivateAVFoundationObjC* callback = strongSelf->m_callback;
+ if (!callback) {
+ [strongRequest finishLoadingWithError:nil];
return;
}
- if (!m_callback->shouldWaitForLoadingOfResource(loadingRequest))
- [loadingRequest finishLoadingWithError:nil];
+ if (!callback->shouldWaitForLoadingOfResource(strongRequest.get()))
+ [strongRequest finishLoadingWithError:nil];
});
return YES;
@@ -2090,14 +2101,17 @@
if (!m_callback)
return NO;
- dispatch_async(dispatch_get_main_queue(), ^{
- if (!m_callback) {
- [[challenge sender] cancelAuthenticationChallenge:challenge];
+ RetainPtr<WebCoreAVFLoaderDelegate> strongSelf = self;
+ RetainPtr<NSURLAuthenticationChallenge> strongChallenge = challenge;
+ callOnMainThread([strongSelf, strongChallenge] {
+ MediaPlayerPrivateAVFoundationObjC* callback = strongSelf->m_callback;
+ if (!callback) {
+ [[strongChallenge sender] cancelAuthenticationChallenge:strongChallenge.get()];
return;
}
- if (!m_callback->shouldWaitForResponseToAuthenticationChallenge(challenge))
- [[challenge sender] cancelAuthenticationChallenge:challenge];
+ if (!callback->shouldWaitForResponseToAuthenticationChallenge(strongChallenge.get()))
+ [[strongChallenge sender] cancelAuthenticationChallenge:strongChallenge.get()];
});
return YES;
@@ -2109,9 +2123,12 @@
if (!m_callback)
return;
- dispatch_async(dispatch_get_main_queue(), ^{
- if (m_callback)
- m_callback->didCancelLoadingRequest(loadingRequest);
+ RetainPtr<WebCoreAVFLoaderDelegate> strongSelf = self;
+ RetainPtr<AVAssetResourceLoadingRequest> strongRequest = loadingRequest;
+ callOnMainThread([strongSelf, strongRequest] {
+ MediaPlayerPrivateAVFoundationObjC* callback = strongSelf->m_callback;
+ if (callback)
+ callback->didCancelLoadingRequest(strongRequest.get());
});
}
