<!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>[247380] 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/247380">247380</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2019-07-11 19:35:07 -0700 (Thu, 11 Jul 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Drop non thread-safe usage of WeakPtr in PlaybackSessionInterfaceAVKit
https://bugs.webkit.org/show_bug.cgi?id=199698

Reviewed by Eric Carlson.

The PlaybackSessionInterfaceAVKit constructor was making a weakPtr on the UI Thread
of an WebThread object. The WeakPtr would then be used as a data member throughout
the class on the UIThread. This is not thread-safe.

This patch switches to using a raw pointer instead of a WeakPtr. This is a partial
rollout of <a href="http://trac.webkit.org/projects/webkit/changeset/243337">r243337</a>, which turned the raw pointer into a WeakPtr for hardening
purposes. For extra safety, this patch updates the VideoFullscreenControllerContext
so that it notifies its clients (i.e. PlaybackSessionInterfaceAVKit) that it is
getting destroyed, so that they can null-out their m_playbackSessionModel data
member. This gives the sames guarantees than WeakPtr but in a thread-safe way.

* platform/cocoa/PlaybackSessionModel.h:
(WebCore::PlaybackSessionModelClient::modelDestroyed):
* platform/ios/PlaybackSessionInterfaceAVKit.h:
* platform/ios/PlaybackSessionInterfaceAVKit.mm:
(WebCore::PlaybackSessionInterfaceAVKit::PlaybackSessionInterfaceAVKit):
(WebCore::PlaybackSessionInterfaceAVKit::~PlaybackSessionInterfaceAVKit):
(WebCore::PlaybackSessionInterfaceAVKit::playbackSessionModel const):
(WebCore::PlaybackSessionInterfaceAVKit::modelDestroyed):
* platform/ios/WebVideoFullscreenControllerAVKit.mm:
(VideoFullscreenControllerContext::~VideoFullscreenControllerContext):
(VideoFullscreenControllerContext::addClient):
(VideoFullscreenControllerContext::removeClient):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaPlaybackSessionModelh">trunk/Source/WebCore/platform/cocoa/PlaybackSessionModel.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosPlaybackSessionInterfaceAVKith">trunk/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.h</a></li>
<li><a href="#trunkSourceWebCoreplatformiosPlaybackSessionInterfaceAVKitmm">trunk/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformiosWebVideoFullscreenControllerAVKitmm">trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (247379 => 247380)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-07-12 02:20:51 UTC (rev 247379)
+++ trunk/Source/WebCore/ChangeLog      2019-07-12 02:35:07 UTC (rev 247380)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2019-07-11  Chris Dumez  <cdumez@apple.com>
+
+        Drop non thread-safe usage of WeakPtr in PlaybackSessionInterfaceAVKit
+        https://bugs.webkit.org/show_bug.cgi?id=199698
+
+        Reviewed by Eric Carlson.
+
+        The PlaybackSessionInterfaceAVKit constructor was making a weakPtr on the UI Thread
+        of an WebThread object. The WeakPtr would then be used as a data member throughout
+        the class on the UIThread. This is not thread-safe.
+
+        This patch switches to using a raw pointer instead of a WeakPtr. This is a partial
+        rollout of r243337, which turned the raw pointer into a WeakPtr for hardening
+        purposes. For extra safety, this patch updates the VideoFullscreenControllerContext
+        so that it notifies its clients (i.e. PlaybackSessionInterfaceAVKit) that it is
+        getting destroyed, so that they can null-out their m_playbackSessionModel data
+        member. This gives the sames guarantees than WeakPtr but in a thread-safe way.
+
+        * platform/cocoa/PlaybackSessionModel.h:
+        (WebCore::PlaybackSessionModelClient::modelDestroyed):
+        * platform/ios/PlaybackSessionInterfaceAVKit.h:
+        * platform/ios/PlaybackSessionInterfaceAVKit.mm:
+        (WebCore::PlaybackSessionInterfaceAVKit::PlaybackSessionInterfaceAVKit):
+        (WebCore::PlaybackSessionInterfaceAVKit::~PlaybackSessionInterfaceAVKit):
+        (WebCore::PlaybackSessionInterfaceAVKit::playbackSessionModel const):
+        (WebCore::PlaybackSessionInterfaceAVKit::modelDestroyed):
+        * platform/ios/WebVideoFullscreenControllerAVKit.mm:
+        (VideoFullscreenControllerContext::~VideoFullscreenControllerContext):
+        (VideoFullscreenControllerContext::addClient):
+        (VideoFullscreenControllerContext::removeClient):
+
</ins><span class="cx"> 2019-07-11  Simon Fraser  <simon.fraser@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Fix builds where HAVE_DESIGN_SYSTEM_UI_FONTS is not defined.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaPlaybackSessionModelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/PlaybackSessionModel.h (247379 => 247380)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/PlaybackSessionModel.h       2019-07-12 02:20:51 UTC (rev 247379)
+++ trunk/Source/WebCore/platform/cocoa/PlaybackSessionModel.h  2019-07-12 02:35:07 UTC (rev 247380)
</span><span class="lines">@@ -110,6 +110,7 @@
</span><span class="cx">     virtual void isPictureInPictureSupportedChanged(bool) { }
</span><span class="cx">     virtual void pictureInPictureActiveChanged(bool) { }
</span><span class="cx">     virtual void ensureControlsManager() { }
</span><ins>+    virtual void modelDestroyed() { }
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosPlaybackSessionInterfaceAVKith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.h (247379 => 247380)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.h        2019-07-12 02:20:51 UTC (rev 247379)
+++ trunk/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.h   2019-07-12 02:35:07 UTC (rev 247380)
</span><span class="lines">@@ -77,6 +77,7 @@
</span><span class="cx">     WEBCORE_EXPORT void wirelessVideoPlaybackDisabledChanged(bool) override;
</span><span class="cx">     WEBCORE_EXPORT void mutedChanged(bool) override;
</span><span class="cx">     WEBCORE_EXPORT void volumeChanged(double) override;
</span><ins>+    WEBCORE_EXPORT void modelDestroyed() override;
</ins><span class="cx"> 
</span><span class="cx">     WEBCORE_EXPORT virtual void invalidate();
</span><span class="cx"> 
</span><span class="lines">@@ -86,7 +87,7 @@
</span><span class="cx">     WEBCORE_EXPORT PlaybackSessionInterfaceAVKit(PlaybackSessionModel&);
</span><span class="cx"> 
</span><span class="cx">     RetainPtr<WebAVPlayerController> m_playerController;
</span><del>-    WeakPtr<PlaybackSessionModel> m_playbackSessionModel;
</del><ins>+    PlaybackSessionModel* m_playbackSessionModel { nullptr };
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosPlaybackSessionInterfaceAVKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.mm (247379 => 247380)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.mm       2019-07-12 02:20:51 UTC (rev 247379)
+++ trunk/Source/WebCore/platform/ios/PlaybackSessionInterfaceAVKit.mm  2019-07-12 02:35:07 UTC (rev 247380)
</span><span class="lines">@@ -51,8 +51,9 @@
</span><span class="cx"> 
</span><span class="cx"> PlaybackSessionInterfaceAVKit::PlaybackSessionInterfaceAVKit(PlaybackSessionModel& model)
</span><span class="cx">     : m_playerController(adoptNS([[WebAVPlayerController alloc] init]))
</span><del>-    , m_playbackSessionModel(makeWeakPtr(model))
</del><ins>+    , m_playbackSessionModel(&model)
</ins><span class="cx"> {
</span><ins>+    ASSERT(isUIThread());
</ins><span class="cx">     model.addClient(*this);
</span><span class="cx">     [m_playerController setPlaybackSessionInterface:this];
</span><span class="cx">     [m_playerController setDelegate:&model];
</span><span class="lines">@@ -71,6 +72,7 @@
</span><span class="cx"> 
</span><span class="cx"> PlaybackSessionInterfaceAVKit::~PlaybackSessionInterfaceAVKit()
</span><span class="cx"> {
</span><ins>+    ASSERT(isUIThread());
</ins><span class="cx">     [m_playerController setPlaybackSessionInterface:nullptr];
</span><span class="cx">     [m_playerController setExternalPlaybackActive:false];
</span><span class="cx"> 
</span><span class="lines">@@ -79,7 +81,7 @@
</span><span class="cx"> 
</span><span class="cx"> PlaybackSessionModel* PlaybackSessionInterfaceAVKit::playbackSessionModel() const
</span><span class="cx"> {
</span><del>-    return m_playbackSessionModel.get();
</del><ins>+    return m_playbackSessionModel;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void PlaybackSessionInterfaceAVKit::durationChanged(double duration)
</span><span class="lines">@@ -219,7 +221,14 @@
</span><span class="cx">     m_playbackSessionModel = nullptr;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void PlaybackSessionInterfaceAVKit::modelDestroyed()
+{
+    ASSERT(isUIThread());
+    invalidate();
+    ASSERT(!m_playbackSessionModel);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><ins>+}
+
</ins><span class="cx"> #endif // HAVE(AVKIT)
</span><span class="cx"> #endif // PLATFORM(IOS_FAMILY)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformiosWebVideoFullscreenControllerAVKitmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm (247379 => 247380)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm   2019-07-12 02:20:51 UTC (rev 247379)
+++ trunk/Source/WebCore/platform/ios/WebVideoFullscreenControllerAVKit.mm      2019-07-12 02:35:07 UTC (rev 247380)
</span><span class="lines">@@ -109,6 +109,8 @@
</span><span class="cx">         return adoptRef(*new VideoFullscreenControllerContext);
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    ~VideoFullscreenControllerContext();
+
</ins><span class="cx">     void setController(WebVideoFullscreenController* controller) { m_controller = controller; }
</span><span class="cx">     void setUpFullscreen(HTMLVideoElement&, UIView *, HTMLMediaElementEnums::VideoFullscreenMode);
</span><span class="cx">     void exitFullscreen();
</span><span class="lines">@@ -216,6 +218,18 @@
</span><span class="cx">     RetainPtr<WebVideoFullscreenController> m_controller;
</span><span class="cx"> };
</span><span class="cx"> 
</span><ins>+VideoFullscreenControllerContext::~VideoFullscreenControllerContext()
+{
+    auto notifyClientsModelWasDestroyed = [this] {
+        while (!m_playbackClients.isEmpty())
+            (*m_playbackClients.begin())->modelDestroyed();
+    };
+    if (isUIThread())
+        notifyClientsModelWasDestroyed();
+    else
+        dispatch_sync(dispatch_get_main_queue(), WTFMove(notifyClientsModelWasDestroyed));
+}
+
</ins><span class="cx"> #pragma mark VideoFullscreenChangeObserver
</span><span class="cx"> 
</span><span class="cx"> void VideoFullscreenControllerContext::requestUpdateInlineRect()
</span><span class="lines">@@ -543,6 +557,7 @@
</span><span class="cx"> 
</span><span class="cx"> void VideoFullscreenControllerContext::addClient(VideoFullscreenModelClient& client)
</span><span class="cx"> {
</span><ins>+    ASSERT(isUIThread());
</ins><span class="cx">     ASSERT(!m_fullscreenClients.contains(&client));
</span><span class="cx">     m_fullscreenClients.add(&client);
</span><span class="cx"> }
</span><span class="lines">@@ -549,6 +564,7 @@
</span><span class="cx"> 
</span><span class="cx"> void VideoFullscreenControllerContext::removeClient(VideoFullscreenModelClient& client)
</span><span class="cx"> {
</span><ins>+    ASSERT(isUIThread());
</ins><span class="cx">     ASSERT(m_fullscreenClients.contains(&client));
</span><span class="cx">     m_fullscreenClients.remove(&client);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>