Title: [151813] branches/safari-537-branch/Source/WebCore
- Revision
- 151813
- Author
- [email protected]
- Date
- 2013-06-20 19:17:39 -0700 (Thu, 20 Jun 2013)
Log Message
Merged r151762. <rdar://problem/13837412>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (151812 => 151813)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-06-21 00:44:38 UTC (rev 151812)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-06-21 02:17:39 UTC (rev 151813)
@@ -1,3 +1,20 @@
+2013-06-20 Lucas Forschler <[email protected]>
+
+ Merge r151762
+
+ 2013-06-19 Alexey Proskuryakov <[email protected]>
+
+ [Mac] Common crashes when playing media
+ https://bugs.webkit.org/show_bug.cgi?id=117813
+ <rdar://problem/13837412>
+
+ Reviewed by Eric Carlson.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (-[WebCoreAVFLoaderDelegate resourceLoader:didCancelLoadingRequest:]):
+ This method may be called from a secondary thread, but it does things that are
+ not thread safe.
+
2013-06-18 Roger Fong <[email protected]>
Disable some feature flags.
Modified: branches/safari-537-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (151812 => 151813)
--- branches/safari-537-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2013-06-21 00:44:38 UTC (rev 151812)
+++ branches/safari-537-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2013-06-21 02:17:39 UTC (rev 151813)
@@ -1709,7 +1709,10 @@
if (!m_callback)
return;
- return m_callback->didCancelLoadingRequest(loadingRequest);
+ dispatch_async(dispatch_get_main_queue(), ^{
+ if (m_callback)
+ m_callback->didCancelLoadingRequest(loadingRequest);
+ });
}
- (void)setCallback:(MediaPlayerPrivateAVFoundationObjC*)callback
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
