<!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>[188716] trunk/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/188716">188716</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-08-20 16:06:13 -0700 (Thu, 20 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop using cancelCallOnMainThread in MediaPlayerPrivateMediaFoundation
https://bugs.webkit.org/show_bug.cgi?id=148252
Reviewed by Tim Horton.
Replace cancelCallOnMainThread with WeakPtrs.
* platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp:
(WebCore::MediaPlayerPrivateMediaFoundation::MediaPlayerPrivateMediaFoundation):
(WebCore::MediaPlayerPrivateMediaFoundation::endCreatedMediaSource):
(WebCore::MediaPlayerPrivateMediaFoundation::endGetEvent):
(WebCore::MediaPlayerPrivateMediaFoundation::~MediaPlayerPrivateMediaFoundation):
(WebCore::MediaPlayerPrivateMediaFoundation::onCreatedMediaSourceCallback):
(WebCore::MediaPlayerPrivateMediaFoundation::onTopologySetCallback):
* platform/graphics/win/MediaPlayerPrivateMediaFoundation.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinMediaPlayerPrivateMediaFoundationcpp">trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinMediaPlayerPrivateMediaFoundationh">trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188715 => 188716)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-20 22:57:57 UTC (rev 188715)
+++ trunk/Source/WebCore/ChangeLog 2015-08-20 23:06:13 UTC (rev 188716)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-08-20 Anders Carlsson <andersca@apple.com>
+
+ Stop using cancelCallOnMainThread in MediaPlayerPrivateMediaFoundation
+ https://bugs.webkit.org/show_bug.cgi?id=148252
+
+ Reviewed by Tim Horton.
+
+ Replace cancelCallOnMainThread with WeakPtrs.
+
+ * platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp:
+ (WebCore::MediaPlayerPrivateMediaFoundation::MediaPlayerPrivateMediaFoundation):
+ (WebCore::MediaPlayerPrivateMediaFoundation::endCreatedMediaSource):
+ (WebCore::MediaPlayerPrivateMediaFoundation::endGetEvent):
+ (WebCore::MediaPlayerPrivateMediaFoundation::~MediaPlayerPrivateMediaFoundation):
+ (WebCore::MediaPlayerPrivateMediaFoundation::onCreatedMediaSourceCallback):
+ (WebCore::MediaPlayerPrivateMediaFoundation::onTopologySetCallback):
+ * platform/graphics/win/MediaPlayerPrivateMediaFoundation.h:
+
</ins><span class="cx"> 2015-08-20 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> WK1 can re-enter layout during FrameView destruction and crash
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinMediaPlayerPrivateMediaFoundationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp (188715 => 188716)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp 2015-08-20 22:57:57 UTC (rev 188715)
+++ trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp 2015-08-20 23:06:13 UTC (rev 188716)
</span><span class="lines">@@ -62,12 +62,7 @@
</span><span class="cx"> , m_hasVideo(false)
</span><span class="cx"> , m_hwndVideo(nullptr)
</span><span class="cx"> , m_readyState(MediaPlayer::HaveNothing)
</span><del>- , m_mediaSession(nullptr)
- , m_sourceResolver(nullptr)
- , m_mediaSource(nullptr)
- , m_topology(nullptr)
- , m_sourcePD(nullptr)
- , m_videoDisplay(nullptr)
</del><ins>+ , m_weakPtrFactory(this)
</ins><span class="cx"> {
</span><span class="cx"> createSession();
</span><span class="cx"> createVideoWindow();
</span><span class="lines">@@ -78,8 +73,6 @@
</span><span class="cx"> notifyDeleted();
</span><span class="cx"> destroyVideoWindow();
</span><span class="cx"> endSession();
</span><del>- cancelCallOnMainThread(onTopologySetCallback, this);
- cancelCallOnMainThread(onCreatedMediaSourceCallback, this);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MediaPlayerPrivateMediaFoundation::registerMediaEngine(MediaEngineRegistrar registrar)
</span><span class="lines">@@ -342,7 +335,12 @@
</span><span class="cx"> hr = asyncResult->GetStatus();
</span><span class="cx"> m_loadingProgress = SUCCEEDED(hr);
</span><span class="cx">
</span><del>- callOnMainThread(onCreatedMediaSourceCallback, this);
</del><ins>+ auto weakPtr = m_weakFactory.createWeakPtr();
+ callOnMainThread([weakPtr] {
+ if (!weakPtr)
+ return;
+ weakPtr->onCreatedMediaSource();
+ });
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -367,7 +365,12 @@
</span><span class="cx">
</span><span class="cx"> switch (mediaEventType) {
</span><span class="cx"> case MESessionTopologySet:
</span><del>- callOnMainThread(onTopologySetCallback, this);
</del><ins>+ auto weakPtr = m_weakFactory.createWeakPtr();
+ callOnMainThread([weakPtr] {
+ if (!weakPtr)
+ return;
+ weakPtr->onTopologySet();
+ });
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case MESessionClosed:
</span><span class="lines">@@ -643,18 +646,6 @@
</span><span class="cx"> m_player->playbackStateChanged();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaPlayerPrivateMediaFoundation::onCreatedMediaSourceCallback(void* context)
-{
- MediaPlayerPrivateMediaFoundation* mediaPlayer = static_cast<MediaPlayerPrivateMediaFoundation*>(context);
- mediaPlayer->onCreatedMediaSource();
-}
-
-void MediaPlayerPrivateMediaFoundation::onTopologySetCallback(void* context)
-{
- MediaPlayerPrivateMediaFoundation* mediaPlayer = static_cast<MediaPlayerPrivateMediaFoundation*>(context);
- mediaPlayer->onTopologySet();
-}
-
</del><span class="cx"> MediaPlayerPrivateMediaFoundation::AsyncCallback::AsyncCallback(MediaPlayerPrivateMediaFoundation* mediaPlayer, bool event)
</span><span class="cx"> : m_refCount(0)
</span><span class="cx"> , m_mediaPlayer(mediaPlayer)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinMediaPlayerPrivateMediaFoundationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.h (188715 => 188716)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.h 2015-08-20 22:57:57 UTC (rev 188715)
+++ trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.h 2015-08-20 23:06:13 UTC (rev 188716)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx">
</span><span class="cx"> #include <wtf/Lock.h>
</span><span class="cx"> #include <wtf/ThreadingPrimitives.h>
</span><ins>+#include <wtf/WeakPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -92,6 +93,7 @@
</span><span class="cx"> HashSet<MediaPlayerListener*> m_listeners;
</span><span class="cx"> Lock m_mutexListeners;
</span><span class="cx">
</span><ins>+ WeakPtrFactory<MediaPlayerPrivateMediaFoundation> m_weakPtrFactory;
</ins><span class="cx"> COMPtr<IMFMediaSession> m_mediaSession;
</span><span class="cx"> COMPtr<IMFSourceResolver> m_sourceResolver;
</span><span class="cx"> COMPtr<IMFMediaSource> m_mediaSource;
</span><span class="lines">@@ -111,8 +113,6 @@
</span><span class="cx">
</span><span class="cx"> void onCreatedMediaSource();
</span><span class="cx"> void onTopologySet();
</span><del>- static void onCreatedMediaSourceCallback(void* context);
- static void onTopologySetCallback(void* context);
</del><span class="cx">
</span><span class="cx"> LPCWSTR registerVideoWindowClass();
</span><span class="cx"> void createVideoWindow();
</span></span></pre>
</div>
</div>
</body>
</html>