<!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>[169856] branches/safari-537.60-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/169856">169856</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-06-11 16:17:06 -0700 (Wed, 11 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/169842">r169842</a>.
2014-06-11 Brent Fulgham <bfulgham@apple.com>
[Win] Avoid deadlock with AVFoundation
https://bugs.webkit.org/show_bug.cgi?id=133762
<rdar://problem/17128248>
Reviewed by Eric Carlson.
Always invoke our notifications asynchronously so that we do not
execute long-running code while holding the AVFWrapper map mutex
lock. AVFoundationCF callbacks can deadlock if we call into AVF
while holding this lock.
* platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
(WebCore::MediaPlayerPrivateAVFoundation::scheduleMainThreadNotification):
* platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
(WebCore::AVFWrapper::legibleOutputCallback): Correct bad assertion.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53760branchSourceWebCoreChangeLog">branches/safari-537.60-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53760branchSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationcpp">branches/safari-537.60-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp</a></li>
<li><a href="#branchessafari53760branchSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFcpp">branches/safari-537.60-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53760branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WebCore/ChangeLog (169855 => 169856)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WebCore/ChangeLog 2014-06-11 23:12:30 UTC (rev 169855)
+++ branches/safari-537.60-branch/Source/WebCore/ChangeLog 2014-06-11 23:17:06 UTC (rev 169856)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-06-11 Brent Fulgham <bfulgham@apple.com>
+
+ Merge r169842.
+
+ 2014-06-11 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Avoid deadlock with AVFoundation
+ https://bugs.webkit.org/show_bug.cgi?id=133762
+ <rdar://problem/17128248>
+
+ Reviewed by Eric Carlson.
+
+ Always invoke our notifications asynchronously so that we do not
+ execute long-running code while holding the AVFWrapper map mutex
+ lock. AVFoundationCF callbacks can deadlock if we call into AVF
+ while holding this lock.
+
+
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
+ (WebCore::MediaPlayerPrivateAVFoundation::scheduleMainThreadNotification):
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
+ (WebCore::AVFWrapper::legibleOutputCallback): Correct bad assertion.
+
</ins><span class="cx"> 2014-05-06 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r165790 (165753)
</span></span></pre></div>
<a id="branchessafari53760branchSourceWebCoreplatformgraphicsavfoundationMediaPlayerPrivateAVFoundationcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp (169855 => 169856)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2014-06-11 23:12:30 UTC (rev 169855)
+++ branches/safari-537.60-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2014-06-11 23:17:06 UTC (rev 169856)
</span><span class="lines">@@ -754,7 +754,11 @@
</span><span class="cx"> // so always go through the queue because notifications happen on different threads.
</span><span class="cx"> m_queuedNotifications.append(notification);
</span><span class="cx">
</span><ins>+#if PLATFORM(WIN)
+ bool delayDispatch = true;
+#else
</ins><span class="cx"> bool delayDispatch = m_delayCallbacks || !isMainThread();
</span><ins>+#endif
</ins><span class="cx"> if (delayDispatch && !m_mainThreadCallPending) {
</span><span class="cx"> m_mainThreadCallPending = true;
</span><span class="cx"> callOnMainThread(mainThreadCallback, this);
</span></span></pre></div>
<a id="branchessafari53760branchSourceWebCoreplatformgraphicsavfoundationcfMediaPlayerPrivateAVFoundationCFcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.60-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (169855 => 169856)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.60-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2014-06-11 23:12:30 UTC (rev 169855)
+++ branches/safari-537.60-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2014-06-11 23:17:06 UTC (rev 169856)
</span><span class="lines">@@ -10,10 +10,10 @@
</span><span class="cx"> * notice, this list of conditions and the following disclaimer in the
</span><span class="cx"> * documentation and/or other materials provided with the distribution.
</span><span class="cx"> *
</span><del>- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
</del><ins>+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
</ins><span class="cx"> * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
</span><span class="cx"> * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
</span><del>- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
</del><ins>+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
</ins><span class="cx"> * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
</span><span class="cx"> * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
</span><span class="cx"> * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
</span><span class="lines">@@ -1614,7 +1614,7 @@
</span><span class="cx">
</span><span class="cx"> void AVFWrapper::legibleOutputCallback(void* context, AVCFPlayerItemLegibleOutputRef legibleOutput, CFArrayRef attributedStrings, CFArrayRef /*nativeSampleBuffers*/, CMTime itemTime)
</span><span class="cx"> {
</span><del>- ASSERT(dispatch_get_main_queue() == dispatch_get_current_queue());
</del><ins>+ ASSERT(dispatch_get_main_queue() != dispatch_get_current_queue());
</ins><span class="cx"> MutexLocker locker(mapLock());
</span><span class="cx"> AVFWrapper* self = avfWrapperForCallbackContext(context);
</span><span class="cx"> if (!self) {
</span></span></pre>
</div>
</div>
</body>
</html>