<!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>[218822] trunk/Source/WebKit2</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/218822">218822</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-06-26 15:36:45 -0700 (Mon, 26 Jun 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>Invalidate WebVideoFullscreenManager when WebPage is destroyed.
https://bugs.webkit.org/show_bug.cgi?id=173835
rdar://problem/32969161

Patch by Jeremy Jones <jeremyj@apple.com> on 2017-06-26
Reviewed by Jer Noble.

WebVideoFullscreenManager has a pointer to WebPage, and even null checks it in a few places,
but the only place it is nulled out is in the destructor. This allows a dangling reference.

This changes invalidates that reference when WebPage is destructed and adds nullchecks
or asserts throughout WebVideoFullscreenManager as appropriate.

* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::~WebPage):
* WebProcess/cocoa/WebVideoFullscreenManager.h:
(WebKit::WebVideoFullscreenManager::invalidate):
* WebProcess/cocoa/WebVideoFullscreenManager.mm:
(WebKit::WebVideoFullscreenManager::~WebVideoFullscreenManager):
(WebKit::WebVideoFullscreenManager::enterVideoFullscreenForVideoElement):
(WebKit::WebVideoFullscreenManager::exitVideoFullscreenForVideoElement):
(WebKit::WebVideoFullscreenManager::exitVideoFullscreenToModeWithoutAnimation):
(WebKit::WebVideoFullscreenManager::hasVideoChanged):
(WebKit::WebVideoFullscreenManager::videoDimensionsChanged):
(WebKit::WebVideoFullscreenManager::didSetupFullscreen):
(WebKit::WebVideoFullscreenManager::didEnterFullscreen):
(WebKit::WebVideoFullscreenManager::didCleanupFullscreen):
(WebKit::WebVideoFullscreenManager::fullscreenMayReturnToInline):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebVideoFullscreenManagerh">trunk/Source/WebKit2/WebProcess/cocoa/WebVideoFullscreenManager.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebVideoFullscreenManagermm">trunk/Source/WebKit2/WebProcess/cocoa/WebVideoFullscreenManager.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (218821 => 218822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog   2017-06-26 21:09:33 UTC (rev 218821)
+++ trunk/Source/WebKit2/ChangeLog      2017-06-26 22:36:45 UTC (rev 218822)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2017-06-26  Jeremy Jones  <jeremyj@apple.com>
+
+        Invalidate WebVideoFullscreenManager when WebPage is destroyed.
+        https://bugs.webkit.org/show_bug.cgi?id=173835
+        rdar://problem/32969161
+
+        Reviewed by Jer Noble.
+
+        WebVideoFullscreenManager has a pointer to WebPage, and even null checks it in a few places,
+        but the only place it is nulled out is in the destructor. This allows a dangling reference.
+
+        This changes invalidates that reference when WebPage is destructed and adds nullchecks
+        or asserts throughout WebVideoFullscreenManager as appropriate.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::~WebPage):
+        * WebProcess/cocoa/WebVideoFullscreenManager.h:
+        (WebKit::WebVideoFullscreenManager::invalidate):
+        * WebProcess/cocoa/WebVideoFullscreenManager.mm:
+        (WebKit::WebVideoFullscreenManager::~WebVideoFullscreenManager):
+        (WebKit::WebVideoFullscreenManager::enterVideoFullscreenForVideoElement):
+        (WebKit::WebVideoFullscreenManager::exitVideoFullscreenForVideoElement):
+        (WebKit::WebVideoFullscreenManager::exitVideoFullscreenToModeWithoutAnimation):
+        (WebKit::WebVideoFullscreenManager::hasVideoChanged):
+        (WebKit::WebVideoFullscreenManager::videoDimensionsChanged):
+        (WebKit::WebVideoFullscreenManager::didSetupFullscreen):
+        (WebKit::WebVideoFullscreenManager::didEnterFullscreen):
+        (WebKit::WebVideoFullscreenManager::didCleanupFullscreen):
+        (WebKit::WebVideoFullscreenManager::fullscreenMayReturnToInline):
+
</ins><span class="cx"> 2017-06-26  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Disable diagnostic logging in ephemeral sessions
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (218821 => 218822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp      2017-06-26 21:09:33 UTC (rev 218821)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2017-06-26 22:36:45 UTC (rev 218822)
</span><span class="lines">@@ -671,6 +671,11 @@
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx">     webPageCounter.decrement();
</span><span class="cx"> #endif
</span><ins>+    
+#if (PLATFORM(IOS) && HAVE(AVKIT)) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
+    if (m_videoFullscreenManager)
+        m_videoFullscreenManager->invalidate();
+#endif
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebPage::dummy(bool&)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebVideoFullscreenManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebVideoFullscreenManager.h (218821 => 218822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebVideoFullscreenManager.h        2017-06-26 21:09:33 UTC (rev 218821)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebVideoFullscreenManager.h   2017-06-26 22:36:45 UTC (rev 218822)
</span><span class="lines">@@ -104,6 +104,8 @@
</span><span class="cx">     static Ref<WebVideoFullscreenManager> create(WebPage&, WebPlaybackSessionManager&);
</span><span class="cx">     virtual ~WebVideoFullscreenManager();
</span><span class="cx">     
</span><ins>+    void invalidate();
+    
</ins><span class="cx">     void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
</span><span class="cx"> 
</span><span class="cx">     // Interface to ChromeClient
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebVideoFullscreenManagermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebVideoFullscreenManager.mm (218821 => 218822)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebVideoFullscreenManager.mm       2017-06-26 21:09:33 UTC (rev 218821)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebVideoFullscreenManager.mm  2017-06-26 22:36:45 UTC (rev 218822)
</span><span class="lines">@@ -123,8 +123,16 @@
</span><span class="cx">     m_contextMap.clear();
</span><span class="cx">     m_videoElements.clear();
</span><span class="cx">     m_clientCounts.clear();
</span><ins>+    
+    if (m_page)
+        WebProcess::singleton().removeMessageReceiver(Messages::WebVideoFullscreenManager::messageReceiverName(), m_page->pageID());
+}
</ins><span class="cx"> 
</span><ins>+void WebVideoFullscreenManager::invalidate()
+{
+    ASSERT(m_page);
</ins><span class="cx">     WebProcess::singleton().removeMessageReceiver(Messages::WebVideoFullscreenManager::messageReceiverName(), m_page->pageID());
</span><ins>+    m_page = nullptr;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> WebVideoFullscreenManager::ModelInterfaceTuple WebVideoFullscreenManager::createModelAndInterface(uint64_t contextId)
</span><span class="lines">@@ -211,6 +219,7 @@
</span><span class="cx"> 
</span><span class="cx"> void WebVideoFullscreenManager::enterVideoFullscreenForVideoElement(HTMLVideoElement& videoElement, HTMLMediaElementEnums::VideoFullscreenMode mode)
</span><span class="cx"> {
</span><ins>+    ASSERT(m_page);
</ins><span class="cx">     ASSERT(mode != HTMLMediaElementEnums::VideoFullscreenModeNone);
</span><span class="cx"> 
</span><span class="cx">     uint64_t contextId = m_playbackSessionManager->contextIdForMediaElement(videoElement);
</span><span class="lines">@@ -246,6 +255,7 @@
</span><span class="cx"> 
</span><span class="cx"> void WebVideoFullscreenManager::exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement& videoElement)
</span><span class="cx"> {
</span><ins>+    ASSERT(m_page);
</ins><span class="cx">     ASSERT(m_videoElements.contains(&videoElement));
</span><span class="cx"> 
</span><span class="cx">     uint64_t contextId = m_videoElements.get(&videoElement);
</span><span class="lines">@@ -263,6 +273,7 @@
</span><span class="cx"> void WebVideoFullscreenManager::exitVideoFullscreenToModeWithoutAnimation(WebCore::HTMLVideoElement& videoElement, WebCore::HTMLMediaElementEnums::VideoFullscreenMode targetMode)
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
</span><ins>+    ASSERT(m_page);
</ins><span class="cx">     ASSERT(m_videoElements.contains(&videoElement));
</span><span class="cx"> 
</span><span class="cx">     uint64_t contextId = m_videoElements.get(&videoElement);
</span><span class="lines">@@ -281,12 +292,14 @@
</span><span class="cx"> 
</span><span class="cx"> void WebVideoFullscreenManager::hasVideoChanged(uint64_t contextId, bool hasVideo)
</span><span class="cx"> {
</span><del>-    m_page->send(Messages::WebVideoFullscreenManagerProxy::SetHasVideo(contextId, hasVideo), m_page->pageID());
</del><ins>+    if (m_page)
+        m_page->send(Messages::WebVideoFullscreenManagerProxy::SetHasVideo(contextId, hasVideo), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void WebVideoFullscreenManager::videoDimensionsChanged(uint64_t contextId, const FloatSize& videoDimensions)
</span><span class="cx"> {
</span><del>-    m_page->send(Messages::WebVideoFullscreenManagerProxy::SetVideoDimensions(contextId, videoDimensions), m_page->pageID());
</del><ins>+    if (m_page)
+        m_page->send(Messages::WebVideoFullscreenManagerProxy::SetVideoDimensions(contextId, videoDimensions), m_page->pageID());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #pragma mark Messages from WebVideoFullscreenManagerProxy:
</span><span class="lines">@@ -303,6 +316,7 @@
</span><span class="cx"> 
</span><span class="cx"> void WebVideoFullscreenManager::didSetupFullscreen(uint64_t contextId)
</span><span class="cx"> {
</span><ins>+    ASSERT(m_page);
</ins><span class="cx">     PlatformLayer* videoLayer = [CALayer layer];
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx">     [videoLayer setName:@"Web video fullscreen manager layer"];
</span><span class="lines">@@ -329,10 +343,8 @@
</span><span class="cx">     
</span><span class="cx">     model->setVideoFullscreenLayer(videoLayer, [strongThis, this, contextId] {
</span><span class="cx">         dispatch_async(dispatch_get_main_queue(), [strongThis, this, contextId] {
</span><del>-            if (!strongThis->m_page)
-                return;
-
-            m_page->send(Messages::WebVideoFullscreenManagerProxy::EnterFullscreen(contextId), strongThis->m_page->pageID());
</del><ins>+            if (strongThis->m_page)
+                m_page->send(Messages::WebVideoFullscreenManagerProxy::EnterFullscreen(contextId), strongThis->m_page->pageID());
</ins><span class="cx">         });
</span><span class="cx">     });
</span><span class="cx">     
</span><span class="lines">@@ -358,7 +370,8 @@
</span><span class="cx">     // exit fullscreen now if it was previously requested during an animation.
</span><span class="cx">     RefPtr<WebVideoFullscreenManager> strongThis(this);
</span><span class="cx">     dispatch_async(dispatch_get_main_queue(), [strongThis, videoElement] {
</span><del>-        strongThis->exitVideoFullscreenForVideoElement(*videoElement);
</del><ins>+        if (strongThis->m_page)
+            strongThis->exitVideoFullscreenForVideoElement(*videoElement);
</ins><span class="cx">     });
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -407,7 +420,8 @@
</span><span class="cx"> 
</span><span class="cx">     RefPtr<WebVideoFullscreenManager> strongThis(this);
</span><span class="cx">     dispatch_async(dispatch_get_main_queue(), [strongThis, videoElement, mode] {
</span><del>-        strongThis->enterVideoFullscreenForVideoElement(*videoElement, mode);
</del><ins>+        if (strongThis->m_page)
+            strongThis->enterVideoFullscreenForVideoElement(*videoElement, mode);
</ins><span class="cx">     });
</span><span class="cx"> }
</span><span class="cx">     
</span><span class="lines">@@ -418,6 +432,9 @@
</span><span class="cx">     
</span><span class="cx"> void WebVideoFullscreenManager::fullscreenMayReturnToInline(uint64_t contextId, bool isPageVisible)
</span><span class="cx"> {
</span><ins>+    if (!m_page)
+        return;
+
</ins><span class="cx">     auto& model = ensureModel(contextId);
</span><span class="cx"> 
</span><span class="cx">     if (!isPageVisible)
</span></span></pre>
</div>
</div>

</body>
</html>