Modified: trunk/Source/WebKit2/ChangeLog (218821 => 218822)
--- 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)
@@ -1,3 +1,33 @@
+2017-06-26 Jeremy Jones <[email protected]>
+
+ 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):
+
2017-06-26 Chris Dumez <[email protected]>
Disable diagnostic logging in ephemeral sessions
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (218821 => 218822)
--- 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)
@@ -671,6 +671,11 @@
#ifndef NDEBUG
webPageCounter.decrement();
#endif
+
+#if (PLATFORM(IOS) && HAVE(AVKIT)) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
+ if (m_videoFullscreenManager)
+ m_videoFullscreenManager->invalidate();
+#endif
}
void WebPage::dummy(bool&)
Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebVideoFullscreenManager.h (218821 => 218822)
--- 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)
@@ -104,6 +104,8 @@
static Ref<WebVideoFullscreenManager> create(WebPage&, WebPlaybackSessionManager&);
virtual ~WebVideoFullscreenManager();
+ void invalidate();
+
void didReceiveMessage(IPC::Connection&, IPC::Decoder&) override;
// Interface to ChromeClient
Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebVideoFullscreenManager.mm (218821 => 218822)
--- 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)
@@ -123,8 +123,16 @@
m_contextMap.clear();
m_videoElements.clear();
m_clientCounts.clear();
+
+ if (m_page)
+ WebProcess::singleton().removeMessageReceiver(Messages::WebVideoFullscreenManager::messageReceiverName(), m_page->pageID());
+}
+void WebVideoFullscreenManager::invalidate()
+{
+ ASSERT(m_page);
WebProcess::singleton().removeMessageReceiver(Messages::WebVideoFullscreenManager::messageReceiverName(), m_page->pageID());
+ m_page = nullptr;
}
WebVideoFullscreenManager::ModelInterfaceTuple WebVideoFullscreenManager::createModelAndInterface(uint64_t contextId)
@@ -211,6 +219,7 @@
void WebVideoFullscreenManager::enterVideoFullscreenForVideoElement(HTMLVideoElement& videoElement, HTMLMediaElementEnums::VideoFullscreenMode mode)
{
+ ASSERT(m_page);
ASSERT(mode != HTMLMediaElementEnums::VideoFullscreenModeNone);
uint64_t contextId = m_playbackSessionManager->contextIdForMediaElement(videoElement);
@@ -246,6 +255,7 @@
void WebVideoFullscreenManager::exitVideoFullscreenForVideoElement(WebCore::HTMLVideoElement& videoElement)
{
+ ASSERT(m_page);
ASSERT(m_videoElements.contains(&videoElement));
uint64_t contextId = m_videoElements.get(&videoElement);
@@ -263,6 +273,7 @@
void WebVideoFullscreenManager::exitVideoFullscreenToModeWithoutAnimation(WebCore::HTMLVideoElement& videoElement, WebCore::HTMLMediaElementEnums::VideoFullscreenMode targetMode)
{
#if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
+ ASSERT(m_page);
ASSERT(m_videoElements.contains(&videoElement));
uint64_t contextId = m_videoElements.get(&videoElement);
@@ -281,12 +292,14 @@
void WebVideoFullscreenManager::hasVideoChanged(uint64_t contextId, bool hasVideo)
{
- m_page->send(Messages::WebVideoFullscreenManagerProxy::SetHasVideo(contextId, hasVideo), m_page->pageID());
+ if (m_page)
+ m_page->send(Messages::WebVideoFullscreenManagerProxy::SetHasVideo(contextId, hasVideo), m_page->pageID());
}
void WebVideoFullscreenManager::videoDimensionsChanged(uint64_t contextId, const FloatSize& videoDimensions)
{
- m_page->send(Messages::WebVideoFullscreenManagerProxy::SetVideoDimensions(contextId, videoDimensions), m_page->pageID());
+ if (m_page)
+ m_page->send(Messages::WebVideoFullscreenManagerProxy::SetVideoDimensions(contextId, videoDimensions), m_page->pageID());
}
#pragma mark Messages from WebVideoFullscreenManagerProxy:
@@ -303,6 +316,7 @@
void WebVideoFullscreenManager::didSetupFullscreen(uint64_t contextId)
{
+ ASSERT(m_page);
PlatformLayer* videoLayer = [CALayer layer];
#ifndef NDEBUG
[videoLayer setName:@"Web video fullscreen manager layer"];
@@ -329,10 +343,8 @@
model->setVideoFullscreenLayer(videoLayer, [strongThis, this, contextId] {
dispatch_async(dispatch_get_main_queue(), [strongThis, this, contextId] {
- if (!strongThis->m_page)
- return;
-
- m_page->send(Messages::WebVideoFullscreenManagerProxy::EnterFullscreen(contextId), strongThis->m_page->pageID());
+ if (strongThis->m_page)
+ m_page->send(Messages::WebVideoFullscreenManagerProxy::EnterFullscreen(contextId), strongThis->m_page->pageID());
});
});
@@ -358,7 +370,8 @@
// exit fullscreen now if it was previously requested during an animation.
RefPtr<WebVideoFullscreenManager> strongThis(this);
dispatch_async(dispatch_get_main_queue(), [strongThis, videoElement] {
- strongThis->exitVideoFullscreenForVideoElement(*videoElement);
+ if (strongThis->m_page)
+ strongThis->exitVideoFullscreenForVideoElement(*videoElement);
});
}
@@ -407,7 +420,8 @@
RefPtr<WebVideoFullscreenManager> strongThis(this);
dispatch_async(dispatch_get_main_queue(), [strongThis, videoElement, mode] {
- strongThis->enterVideoFullscreenForVideoElement(*videoElement, mode);
+ if (strongThis->m_page)
+ strongThis->enterVideoFullscreenForVideoElement(*videoElement, mode);
});
}
@@ -418,6 +432,9 @@
void WebVideoFullscreenManager::fullscreenMayReturnToInline(uint64_t contextId, bool isPageVisible)
{
+ if (!m_page)
+ return;
+
auto& model = ensureModel(contextId);
if (!isPageVisible)
