<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[160424] branches/safari-537.74-branch/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/160424">160424</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2013-12-11 04:14:24 -0800 (Wed, 11 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/159691">r159691</a>. <rdar://problem/15560410></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53774branchSourceWebCoreChangeLog">branches/safari-537.74-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53774branchSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFcpp">branches/safari-537.74-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53774branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.74-branch/Source/WebCore/ChangeLog (160423 => 160424)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.74-branch/Source/WebCore/ChangeLog 2013-12-11 12:12:06 UTC (rev 160423)
+++ branches/safari-537.74-branch/Source/WebCore/ChangeLog 2013-12-11 12:14:24 UTC (rev 160424)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2013-12-11 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r159691
+
+ 2013-11-22 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Avoid deadlock when interacting with some AVFoundationCF content
+ <rdar://problem/15482977> and https://bugs.webkit.org/show_bug.cgi?id=124752
+
+ Prevent deadlock caused by conflict over the "mapLock" mutex. Notification handling in the file,
+ which modify assets and make other changes, are required to happen on the main thread. This
+ patch enforces this requirement.
+
+ Reviewed by Eric Carlson.
+
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
+ (WebCore::NotificationCallbackData::NotificationCallbackData): Added
+ (WebCore::AVFWrapper::processNotification): Moved logic from 'notificationCallback', which was
+ sometimes happening on a background thread.
+ (WebCore::AVFWrapper::notificationCallback): Dispatch calls to main thread.
+
+2013-12-11 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r159460
</span><span class="cx">
</span><span class="cx"> 2013-11-18 David Hyatt <hyatt@apple.com>
</span></span></pre></div>
<a id="branchessafari53774branchSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.74-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (160423 => 160424)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.74-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2013-12-11 12:12:06 UTC (rev 160423)
+++ branches/safari-537.74-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2013-12-11 12:14:24 UTC (rev 160424)
</span><span class="lines">@@ -115,6 +115,7 @@
</span><span class="cx"> static void periodicTimeObserverCallback(AVCFPlayerRef, CMTime, void*);
</span><span class="cx"> static void seekCompletedCallback(AVCFPlayerItemRef, Boolean, void*);
</span><span class="cx"> static void notificationCallback(CFNotificationCenterRef, void*, CFStringRef, const void*, CFDictionaryRef);
</span><ins>+ static void processNotification(void* context);
</ins><span class="cx">
</span><span class="cx"> inline AVCFPlayerLayerRef videoLayer() const { return (AVCFPlayerLayerRef)m_avCFVideoLayer.get(); }
</span><span class="cx"> inline AVCFPlayerRef avPlayer() const { return (AVCFPlayerRef)m_avPlayer.get(); }
</span><span class="lines">@@ -1392,21 +1393,34 @@
</span><span class="cx"> self->m_owner->scheduleMainThreadNotification(MediaPlayerPrivateAVFoundation::Notification::PlayerTimeChanged, time);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AVFWrapper::notificationCallback(CFNotificationCenterRef, void* observer, CFStringRef propertyName, const void* object, CFDictionaryRef)
</del><ins>+struct NotificationCallbackData {
+ RetainPtr<CFStringRef> m_propertyName;
+ void* m_context;
+
+ NotificationCallbackData(CFStringRef propertyName, void* context)
+ : m_propertyName(propertyName), m_context(context)
+ {
+ }
+};
+
+void AVFWrapper::processNotification(void* context)
</ins><span class="cx"> {
</span><ins>+ ASSERT(dispatch_get_main_queue() == dispatch_get_current_queue());
+ ASSERT(context);
+
+ if (!context)
+ return;
+
+ OwnPtr<NotificationCallbackData> notificationData = adoptPtr(reinterpret_cast<NotificationCallbackData*>(context));
+
</ins><span class="cx"> MutexLocker locker(mapLock());
</span><del>- AVFWrapper* self = avfWrapperForCallbackContext(observer);
-
</del><ins>+ AVFWrapper* self = avfWrapperForCallbackContext(notificationData->m_context);
</ins><span class="cx"> if (!self) {
</span><del>- LOG(Media, "AVFWrapper::notificationCallback invoked for deleted AVFWrapper %d", reinterpret_cast<uintptr_t>(observer));
</del><ins>+ LOG(Media, "AVFWrapper::processNotification invoked for deleted AVFWrapper %d", reinterpret_cast<uintptr_t>(context));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !LOG_DISABLED
- char notificationName[256];
- CFStringGetCString(propertyName, notificationName, sizeof(notificationName), kCFStringEncodingASCII);
- LOG(Media, "AVFWrapper::notificationCallback(%p) %s", self, notificationName);
-#endif
</del><ins>+ CFStringRef propertyName = notificationData->m_propertyName.get();
</ins><span class="cx">
</span><span class="cx"> if (CFEqual(propertyName, AVCFPlayerItemDidPlayToEndTimeNotification))
</span><span class="cx"> self->m_owner->scheduleMainThreadNotification(MediaPlayerPrivateAVFoundation::Notification::ItemDidPlayToEndTime);
</span><span class="lines">@@ -1437,6 +1451,19 @@
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void AVFWrapper::notificationCallback(CFNotificationCenterRef, void* observer, CFStringRef propertyName, const void* object, CFDictionaryRef)
+{
+#if !LOG_DISABLED
+ char notificationName[256];
+ CFStringGetCString(propertyName, notificationName, sizeof(notificationName), kCFStringEncodingASCII);
+ LOG(Media, "AVFWrapper::notificationCallback(if=%d) %s", reinterpret_cast<uintptr_t>(observer), notificationName);
+#endif
+
+ OwnPtr<NotificationCallbackData> notificationData = adoptPtr(new NotificationCallbackData(propertyName, observer));
+
+ dispatch_async_f(dispatch_get_main_queue(), notificationData.leakPtr(), processNotification);
+}
+
</ins><span class="cx"> void AVFWrapper::loadPlayableCompletionCallback(AVCFAssetRef, void* context)
</span><span class="cx"> {
</span><span class="cx"> MutexLocker locker(mapLock());
</span></span></pre>
</div>
</div>
</body>
</html>