REGRESSION (iOS 17): Chrome crashes in VideoFullscreenModelContext::requestRouteSharingPolicyAndContextUID

jernoble · jernoble · commit 2ad2ad37c92c · 2023-10-18T08:54:03.000-07:00
https://bugs.webkit.org/show_bug.cgi?id=261676 rdar://80955844 Reviewed by Andy Estes. Because VideoPresentationManagerProxy (nee VideoFullscreenManagerProxy) is refcounted, its lifetime can differ significantly from the WebPageProxy that owns it. When the WebPageProxy invalidates and releases the VideoPresentationManagerProxy, it may still have active operations which expect to call into WebPageProxy, but the m_page pointer has already been reset to null. Add null-checks ahead of all references to m_page and bail out early. * Source/WebKit/UIProcess/Cocoa/VideoPresentationManagerProxy.mm: (WebKit::VideoPresentationModelContext::presentingViewController): (WebKit::VideoPresentationManagerProxy::~VideoPresentationManagerProxy): (WebKit::VideoPresentationManagerProxy::invalidate): (WebKit::VideoPresentationManagerProxy::requestRouteSharingPolicyAndContextUID): (WebKit::VideoPresentationManagerProxy::requestBitmapImageForCurrentTime): (WebKit::VideoPresentationManagerProxy::hasVideoInPictureInPictureDidChange): (WebKit::VideoPresentationManagerProxy::setupFullscreenWithID): (WebKit::VideoPresentationManagerProxy::exitFullscreen): (WebKit::VideoPresentationManagerProxy::preparedToReturnToInline): (WebKit::VideoPresentationManagerProxy::requestFullscreenMode): (WebKit::VideoPresentationManagerProxy::requestUpdateInlineRect): (WebKit::VideoPresentationManagerProxy::requestVideoContentLayer): (WebKit::VideoPresentationManagerProxy::returnVideoContentLayer): (WebKit::VideoPresentationManagerProxy::didSetupFullscreen): (WebKit::VideoPresentationManagerProxy::willExitFullscreen): (WebKit::VideoPresentationManagerProxy::didExitFullscreen): (WebKit::VideoPresentationManagerProxy::didEnterFullscreen): (WebKit::VideoPresentationManagerProxy::failedToEnterFullscreen): (WebKit::VideoPresentationManagerProxy::didCleanupFullscreen): (WebKit::VideoPresentationManagerProxy::setVideoLayerFrame): (WebKit::VideoPresentationManagerProxy::setVideoLayerGravity): (WebKit::VideoPresentationManagerProxy::fullscreenModeChanged): (WebKit::VideoPresentationManagerProxy::fullscreenMayReturnToInline): Canonical link: https://commits.webkit.org/269467@main
diff --git a/Source/WebKit/UIProcess/Cocoa/VideoPresentationManagerProxy.mm b/Source/WebKit/UIProcess/Cocoa/VideoPresentationManagerProxy.mm
@@ -270,9 +270,11 @@ - (BOOL)prefersStatusBarHidden
 #if PLATFORM(IOS_FAMILY)
 UIViewController *VideoPresentationModelContext::presentingViewController()
 {
-    if (m_manager)
-        return m_manager->m_page->uiClient().presentingViewController();
+    if (!m_manager)
+        return nullptr;
 
+    if (auto* page = m_manager->m_page.get())
+        return page->uiClient().presentingViewController();
     return nullptr;
 }
 
@@ -448,18 +450,18 @@ - (BOOL)prefersStatusBarHidden
     ALWAYS_LOG(LOGIDENTIFIER);
     callCloseCompletionHandlers();
 
-    if (!m_page)
-        return;
     invalidate();
 }
 
 void VideoPresentationManagerProxy::invalidate()
 {
     ALWAYS_LOG(LOGIDENTIFIER);
-    m_page->process().removeMessageReceiver(Messages::VideoPresentationManagerProxy::messageReceiverName(), m_page->webPageID());
-    m_page = nullptr;
+    if (m_page) {
+        m_page->process().removeMessageReceiver(Messages::VideoPresentationManagerProxy::messageReceiverName(), m_page->webPageID());
+        m_page = nullptr;
+    }
 
-    auto contextMap = WTFMove(m_contextMap);
+    auto contextMap = std::exchange(m_contextMap, { });
     m_clientCounts.clear();
 
     for (auto& [model, interface] : contextMap.values()) {
@@ -523,7 +525,8 @@ - (BOOL)prefersStatusBarHidden
 
 void VideoPresentationManagerProxy::requestRouteSharingPolicyAndContextUID(PlaybackSessionContextIdentifier contextId, CompletionHandler<void(WebCore::RouteSharingPolicy, String)>&& callback)
 {
-    m_page->sendWithAsyncReply(Messages::VideoPresentationManager::RequestRouteSharingPolicyAndContextUID(contextId), WTFMove(callback));
+    if (m_page)
+        m_page->sendWithAsyncReply(Messages::VideoPresentationManager::RequestRouteSharingPolicyAndContextUID(contextId), WTFMove(callback));
 }
 
 VideoPresentationManagerProxy::ModelInterfaceTuple VideoPresentationManagerProxy::createModelAndInterface(PlaybackSessionContextIdentifier contextId)
@@ -621,6 +624,11 @@ - (BOOL)prefersStatusBarHidden
 
 void VideoPresentationManagerProxy::requestBitmapImageForCurrentTime(PlaybackSessionContextIdentifier identifier, CompletionHandler<void(std::optional<ShareableBitmap::Handle>&&)>&& completionHandler)
 {
+    if (!m_page) {
+        completionHandler(std::nullopt);
+        return;
+    }
+
     RefPtr gpuProcess = GPUProcessProxy::singletonIfCreated();
     if (!gpuProcess) {
         completionHandler(std::nullopt);
@@ -652,6 +660,8 @@ - (BOOL)prefersStatusBarHidden
 {
     ALWAYS_LOG(LOGIDENTIFIER, value);
     RefPtr page = m_page.get();
+    if (!page)
+        return;
     page->uiClient().hasVideoInPictureInPictureDidChange(page.get(), value);
     m_pipChangeObservers.forEach([value] (auto& observer) { observer(value); });
 }
@@ -759,6 +769,9 @@ - (BOOL)prefersStatusBarHidden
 
 void VideoPresentationManagerProxy::setupFullscreenWithID(PlaybackSessionContextIdentifier contextId, WebKit::LayerHostingContextID videoLayerID, const WebCore::FloatRect& screenRect, const WebCore::FloatSize& initialSize, const WebCore::FloatSize& videoDimensions, float hostingDeviceScaleFactor, HTMLMediaElementEnums::VideoFullscreenMode videoFullscreenMode, bool allowsPictureInPicture, bool standby, bool blocksReturnToFullscreenFromPictureInPicture)
 {
+    if (!m_page)
+        return;
+
     auto& [model, interface] = ensureModelAndInterface(contextId);
 
     // Do not add another refcount for this contextId if the interface is already in
@@ -849,6 +862,11 @@ - (BOOL)prefersStatusBarHidden
 
 void VideoPresentationManagerProxy::exitFullscreen(PlaybackSessionContextIdentifier contextId, WebCore::FloatRect finalRect, CompletionHandler<void(bool)>&& completionHandler)
 {
+    if (!m_page) {
+        completionHandler(false);
+        return;
+    }
+
     ASSERT(m_contextMap.contains(contextId));
     if (!m_contextMap.contains(contextId)) {
         completionHandler(false);
@@ -942,6 +960,9 @@ - (BOOL)prefersStatusBarHidden
 
 void VideoPresentationManagerProxy::preparedToReturnToInline(PlaybackSessionContextIdentifier contextId, bool visible, WebCore::FloatRect inlineRect)
 {
+    if (!m_page)
+        return;
+
     m_page->fullscreenMayReturnToInline();
 
 #if !PLATFORM(IOS_FAMILY)
@@ -1010,22 +1031,26 @@ - (BOOL)prefersStatusBarHidden
 
 void VideoPresentationManagerProxy::requestFullscreenMode(PlaybackSessionContextIdentifier contextId, WebCore::HTMLMediaElementEnums::VideoFullscreenMode mode, bool finishedWithMedia)
 {
-    m_page->send(Messages::VideoPresentationManager::RequestFullscreenMode(contextId, mode, finishedWithMedia));
+    if (m_page)
+        m_page->send(Messages::VideoPresentationManager::RequestFullscreenMode(contextId, mode, finishedWithMedia));
 }
 
 void VideoPresentationManagerProxy::requestUpdateInlineRect(PlaybackSessionContextIdentifier contextId)
 {
-    m_page->send(Messages::VideoPresentationManager::RequestUpdateInlineRect(contextId));
+    if (m_page)
+        m_page->send(Messages::VideoPresentationManager::RequestUpdateInlineRect(contextId));
 }
 
 void VideoPresentationManagerProxy::requestVideoContentLayer(PlaybackSessionContextIdentifier contextId)
 {
-    m_page->send(Messages::VideoPresentationManager::RequestVideoContentLayer(contextId));
+    if (m_page)
+        m_page->send(Messages::VideoPresentationManager::RequestVideoContentLayer(contextId));
 }
 
 void VideoPresentationManagerProxy::returnVideoContentLayer(PlaybackSessionContextIdentifier contextId)
 {
-    m_page->send(Messages::VideoPresentationManager::ReturnVideoContentLayer(contextId));
+    if (m_page)
+        m_page->send(Messages::VideoPresentationManager::ReturnVideoContentLayer(contextId));
 }
 
 void VideoPresentationManagerProxy::returnVideoView(PlaybackSessionContextIdentifier contextId)
@@ -1049,17 +1074,22 @@ - (BOOL)prefersStatusBarHidden
 #if PLATFORM(IOS_FAMILY)
     enterFullscreen(contextId);
 #else
-    m_page->send(Messages::VideoPresentationManager::DidSetupFullscreen(contextId));
+    if (m_page)
+        m_page->send(Messages::VideoPresentationManager::DidSetupFullscreen(contextId));
 #endif
 }
 
 void VideoPresentationManagerProxy::willExitFullscreen(PlaybackSessionContextIdentifier contextId)
 {
-    m_page->send(Messages::VideoPresentationManager::WillExitFullscreen(contextId));
+    if (m_page)
+        m_page->send(Messages::VideoPresentationManager::WillExitFullscreen(contextId));
 }
 
 void VideoPresentationManagerProxy::didExitFullscreen(PlaybackSessionContextIdentifier contextId)
 {
+    if (!m_page)
+        return;
+
     m_page->send(Messages::VideoPresentationManager::DidExitFullscreen(contextId));
 
 #if PLATFORM(IOS_FAMILY)
@@ -1074,6 +1104,9 @@ - (BOOL)prefersStatusBarHidden
 
 void VideoPresentationManagerProxy::didEnterFullscreen(PlaybackSessionContextIdentifier contextId, const WebCore::FloatSize& size)
 {
+    if (!m_page)
+        return;
+
     std::optional<FloatSize> optionalSize;
     if (!size.isEmpty())
         optionalSize = size;
@@ -1089,11 +1122,15 @@ - (BOOL)prefersStatusBarHidden
 
 void VideoPresentationManagerProxy::failedToEnterFullscreen(PlaybackSessionContextIdentifier contextId)
 {
-    m_page->send(Messages::VideoPresentationManager::FailedToEnterFullscreen(contextId));
+    if (m_page)
+        m_page->send(Messages::VideoPresentationManager::FailedToEnterFullscreen(contextId));
 }
 
 void VideoPresentationManagerProxy::didCleanupFullscreen(PlaybackSessionContextIdentifier contextId)
 {
+    if (!m_page)
+        return;
+
     auto& [model, interface] = ensureModelAndInterface(contextId);
 
     [model->layerHostView() removeFromSuperview];
@@ -1117,6 +1154,9 @@ - (BOOL)prefersStatusBarHidden
 
 void VideoPresentationManagerProxy::setVideoLayerFrame(PlaybackSessionContextIdentifier contextId, WebCore::FloatRect frame)
 {
+    if (!m_page)
+        return;
+
     auto& [model, interface] = ensureModelAndInterface(contextId);
     interface->setCaptionsFrame(CGRectMake(0, 0, frame.width(), frame.height()));
 #if PLATFORM(IOS_FAMILY)
@@ -1132,17 +1172,20 @@ - (BOOL)prefersStatusBarHidden
 
 void VideoPresentationManagerProxy::setVideoLayerGravity(PlaybackSessionContextIdentifier contextId, WebCore::MediaPlayerEnums::VideoGravity gravity)
 {
-    m_page->send(Messages::VideoPresentationManager::SetVideoLayerGravityEnum(contextId, (unsigned)gravity));
+    if (m_page)
+        m_page->send(Messages::VideoPresentationManager::SetVideoLayerGravityEnum(contextId, (unsigned)gravity));
 }
 
 void VideoPresentationManagerProxy::fullscreenModeChanged(PlaybackSessionContextIdentifier contextId, WebCore::HTMLMediaElementEnums::VideoFullscreenMode mode)
 {
-    m_page->send(Messages::VideoPresentationManager::FullscreenModeChanged(contextId, mode));
+    if (m_page)
+        m_page->send(Messages::VideoPresentationManager::FullscreenModeChanged(contextId, mode));
 }
 
 void VideoPresentationManagerProxy::fullscreenMayReturnToInline(PlaybackSessionContextIdentifier contextId)
 {
-    m_page->send(Messages::VideoPresentationManager::FullscreenMayReturnToInline(contextId, m_page->isViewVisible()));
+    if (m_page)
+        m_page->send(Messages::VideoPresentationManager::FullscreenMayReturnToInline(contextId, m_page->isViewVisible()));
 }
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -270,9 +270,11 @@ - (BOOL)prefersStatusBarHidden`
`270`	`270`	`#if PLATFORM(IOS_FAMILY)`
`271`	`271`	`UIViewController *VideoPresentationModelContext::presentingViewController()`
`272`	`272`	`{`
`273`		`- if (m_manager)`
`274`		`- return m_manager->m_page->uiClient().presentingViewController();`
	`273`	`+ if (!m_manager)`
	`274`	`+ return nullptr;`
`275`	`275`
	`276`	`+ if (auto* page = m_manager->m_page.get())`
	`277`	`+ return page->uiClient().presentingViewController();`
`276`	`278`	`return nullptr;`
`277`	`279`	`}`
`278`	`280`
`@@ -448,18 +450,18 @@ - (BOOL)prefersStatusBarHidden`
`448`	`450`	`ALWAYS_LOG(LOGIDENTIFIER);`
`449`	`451`	`callCloseCompletionHandlers();`
`450`	`452`
`451`		`- if (!m_page)`
`452`		`- return;`
`453`	`453`	`invalidate();`
`454`	`454`	`}`
`455`	`455`
`456`	`456`	`void VideoPresentationManagerProxy::invalidate()`
`457`	`457`	`{`
`458`	`458`	`ALWAYS_LOG(LOGIDENTIFIER);`
`459`		`- m_page->process().removeMessageReceiver(Messages::VideoPresentationManagerProxy::messageReceiverName(), m_page->webPageID());`
`460`		`- m_page = nullptr;`
	`459`	`+ if (m_page) {`
	`460`	`+ m_page->process().removeMessageReceiver(Messages::VideoPresentationManagerProxy::messageReceiverName(), m_page->webPageID());`
	`461`	`+ m_page = nullptr;`
	`462`	`+ }`
`461`	`463`
`462`		`- auto contextMap = WTFMove(m_contextMap);`
	`464`	`+ auto contextMap = std::exchange(m_contextMap, { });`
`463`	`465`	`m_clientCounts.clear();`
`464`	`466`
`465`	`467`	`for (auto& [model, interface] : contextMap.values()) {`
`@@ -523,7 +525,8 @@ - (BOOL)prefersStatusBarHidden`
`523`	`525`
`524`	`526`	`void VideoPresentationManagerProxy::requestRouteSharingPolicyAndContextUID(PlaybackSessionContextIdentifier contextId, CompletionHandler<void(WebCore::RouteSharingPolicy, String)>&& callback)`
`525`	`527`	`{`
`526`		`- m_page->sendWithAsyncReply(Messages::VideoPresentationManager::RequestRouteSharingPolicyAndContextUID(contextId), WTFMove(callback));`
	`528`	`+ if (m_page)`
	`529`	`+ m_page->sendWithAsyncReply(Messages::VideoPresentationManager::RequestRouteSharingPolicyAndContextUID(contextId), WTFMove(callback));`
`527`	`530`	`}`
`528`	`531`
`529`	`532`	`VideoPresentationManagerProxy::ModelInterfaceTuple VideoPresentationManagerProxy::createModelAndInterface(PlaybackSessionContextIdentifier contextId)`
`@@ -621,6 +624,11 @@ - (BOOL)prefersStatusBarHidden`
`621`	`624`
`622`	`625`	`void VideoPresentationManagerProxy::requestBitmapImageForCurrentTime(PlaybackSessionContextIdentifier identifier, CompletionHandler<void(std::optional<ShareableBitmap::Handle>&&)>&& completionHandler)`
`623`	`626`	`{`
	`627`	`+ if (!m_page) {`
	`628`	`+ completionHandler(std::nullopt);`
	`629`	`+ return;`
	`630`	`+ }`
	`631`	`+`
`624`	`632`	`RefPtr gpuProcess = GPUProcessProxy::singletonIfCreated();`
`625`	`633`	`if (!gpuProcess) {`
`626`	`634`	`completionHandler(std::nullopt);`
`@@ -652,6 +660,8 @@ - (BOOL)prefersStatusBarHidden`
`652`	`660`	`{`
`653`	`661`	`ALWAYS_LOG(LOGIDENTIFIER, value);`
`654`	`662`	`RefPtr page = m_page.get();`
	`663`	`+ if (!page)`
	`664`	`+ return;`
`655`	`665`	`page->uiClient().hasVideoInPictureInPictureDidChange(page.get(), value);`
`656`	`666`	`m_pipChangeObservers.forEach([value] (auto& observer) { observer(value); });`
`657`	`667`	`}`
`@@ -759,6 +769,9 @@ - (BOOL)prefersStatusBarHidden`
`759`	`769`
`760`	`770`	`void VideoPresentationManagerProxy::setupFullscreenWithID(PlaybackSessionContextIdentifier contextId, WebKit::LayerHostingContextID videoLayerID, const WebCore::FloatRect& screenRect, const WebCore::FloatSize& initialSize, const WebCore::FloatSize& videoDimensions, float hostingDeviceScaleFactor, HTMLMediaElementEnums::VideoFullscreenMode videoFullscreenMode, bool allowsPictureInPicture, bool standby, bool blocksReturnToFullscreenFromPictureInPicture)`
`761`	`771`	`{`
	`772`	`+ if (!m_page)`
	`773`	`+ return;`
	`774`	`+`
`762`	`775`	`auto& [model, interface] = ensureModelAndInterface(contextId);`
`763`	`776`
`764`	`777`	`// Do not add another refcount for this contextId if the interface is already in`
`@@ -849,6 +862,11 @@ - (BOOL)prefersStatusBarHidden`
`849`	`862`
`850`	`863`	`void VideoPresentationManagerProxy::exitFullscreen(PlaybackSessionContextIdentifier contextId, WebCore::FloatRect finalRect, CompletionHandler<void(bool)>&& completionHandler)`
`851`	`864`	`{`
	`865`	`+ if (!m_page) {`
	`866`	`+ completionHandler(false);`
	`867`	`+ return;`
	`868`	`+ }`
	`869`	`+`
`852`	`870`	`ASSERT(m_contextMap.contains(contextId));`
`853`	`871`	`if (!m_contextMap.contains(contextId)) {`
`854`	`872`	`completionHandler(false);`
`@@ -942,6 +960,9 @@ - (BOOL)prefersStatusBarHidden`
`942`	`960`
`943`	`961`	`void VideoPresentationManagerProxy::preparedToReturnToInline(PlaybackSessionContextIdentifier contextId, bool visible, WebCore::FloatRect inlineRect)`
`944`	`962`	`{`
	`963`	`+ if (!m_page)`
	`964`	`+ return;`
	`965`	`+`
`945`	`966`	`m_page->fullscreenMayReturnToInline();`
`946`	`967`
`947`	`968`	`#if !PLATFORM(IOS_FAMILY)`
`@@ -1010,22 +1031,26 @@ - (BOOL)prefersStatusBarHidden`
`1010`	`1031`
`1011`	`1032`	`void VideoPresentationManagerProxy::requestFullscreenMode(PlaybackSessionContextIdentifier contextId, WebCore::HTMLMediaElementEnums::VideoFullscreenMode mode, bool finishedWithMedia)`
`1012`	`1033`	`{`
`1013`		`- m_page->send(Messages::VideoPresentationManager::RequestFullscreenMode(contextId, mode, finishedWithMedia));`
	`1034`	`+ if (m_page)`
	`1035`	`+ m_page->send(Messages::VideoPresentationManager::RequestFullscreenMode(contextId, mode, finishedWithMedia));`
`1014`	`1036`	`}`
`1015`	`1037`
`1016`	`1038`	`void VideoPresentationManagerProxy::requestUpdateInlineRect(PlaybackSessionContextIdentifier contextId)`
`1017`	`1039`	`{`
`1018`		`- m_page->send(Messages::VideoPresentationManager::RequestUpdateInlineRect(contextId));`
	`1040`	`+ if (m_page)`
	`1041`	`+ m_page->send(Messages::VideoPresentationManager::RequestUpdateInlineRect(contextId));`
`1019`	`1042`	`}`
`1020`	`1043`
`1021`	`1044`	`void VideoPresentationManagerProxy::requestVideoContentLayer(PlaybackSessionContextIdentifier contextId)`
`1022`	`1045`	`{`
`1023`		`- m_page->send(Messages::VideoPresentationManager::RequestVideoContentLayer(contextId));`
	`1046`	`+ if (m_page)`
	`1047`	`+ m_page->send(Messages::VideoPresentationManager::RequestVideoContentLayer(contextId));`
`1024`	`1048`	`}`
`1025`	`1049`
`1026`	`1050`	`void VideoPresentationManagerProxy::returnVideoContentLayer(PlaybackSessionContextIdentifier contextId)`
`1027`	`1051`	`{`
`1028`		`- m_page->send(Messages::VideoPresentationManager::ReturnVideoContentLayer(contextId));`
	`1052`	`+ if (m_page)`
	`1053`	`+ m_page->send(Messages::VideoPresentationManager::ReturnVideoContentLayer(contextId));`
`1029`	`1054`	`}`
`1030`	`1055`
`1031`	`1056`	`void VideoPresentationManagerProxy::returnVideoView(PlaybackSessionContextIdentifier contextId)`
`@@ -1049,17 +1074,22 @@ - (BOOL)prefersStatusBarHidden`
`1049`	`1074`	`#if PLATFORM(IOS_FAMILY)`
`1050`	`1075`	`enterFullscreen(contextId);`
`1051`	`1076`	`#else`
`1052`		`- m_page->send(Messages::VideoPresentationManager::DidSetupFullscreen(contextId));`
	`1077`	`+ if (m_page)`
	`1078`	`+ m_page->send(Messages::VideoPresentationManager::DidSetupFullscreen(contextId));`
`1053`	`1079`	`#endif`
`1054`	`1080`	`}`
`1055`	`1081`
`1056`	`1082`	`void VideoPresentationManagerProxy::willExitFullscreen(PlaybackSessionContextIdentifier contextId)`
`1057`	`1083`	`{`
`1058`		`- m_page->send(Messages::VideoPresentationManager::WillExitFullscreen(contextId));`
	`1084`	`+ if (m_page)`
	`1085`	`+ m_page->send(Messages::VideoPresentationManager::WillExitFullscreen(contextId));`
`1059`	`1086`	`}`
`1060`	`1087`
`1061`	`1088`	`void VideoPresentationManagerProxy::didExitFullscreen(PlaybackSessionContextIdentifier contextId)`
`1062`	`1089`	`{`
	`1090`	`+ if (!m_page)`
	`1091`	`+ return;`
	`1092`	`+`
`1063`	`1093`	`m_page->send(Messages::VideoPresentationManager::DidExitFullscreen(contextId));`
`1064`	`1094`
`1065`	`1095`	`#if PLATFORM(IOS_FAMILY)`
`@@ -1074,6 +1104,9 @@ - (BOOL)prefersStatusBarHidden`
`1074`	`1104`
`1075`	`1105`	`void VideoPresentationManagerProxy::didEnterFullscreen(PlaybackSessionContextIdentifier contextId, const WebCore::FloatSize& size)`
`1076`	`1106`	`{`
	`1107`	`+ if (!m_page)`
	`1108`	`+ return;`
	`1109`	`+`
`1077`	`1110`	`std::optional<FloatSize> optionalSize;`
`1078`	`1111`	`if (!size.isEmpty())`
`1079`	`1112`	`optionalSize = size;`
`@@ -1089,11 +1122,15 @@ - (BOOL)prefersStatusBarHidden`
`1089`	`1122`
`1090`	`1123`	`void VideoPresentationManagerProxy::failedToEnterFullscreen(PlaybackSessionContextIdentifier contextId)`
`1091`	`1124`	`{`
`1092`		`- m_page->send(Messages::VideoPresentationManager::FailedToEnterFullscreen(contextId));`
	`1125`	`+ if (m_page)`
	`1126`	`+ m_page->send(Messages::VideoPresentationManager::FailedToEnterFullscreen(contextId));`
`1093`	`1127`	`}`
`1094`	`1128`
`1095`	`1129`	`void VideoPresentationManagerProxy::didCleanupFullscreen(PlaybackSessionContextIdentifier contextId)`
`1096`	`1130`	`{`
	`1131`	`+ if (!m_page)`
	`1132`	`+ return;`
	`1133`	`+`
`1097`	`1134`	`auto& [model, interface] = ensureModelAndInterface(contextId);`
`1098`	`1135`
`1099`	`1136`	`[model->layerHostView() removeFromSuperview];`
`@@ -1117,6 +1154,9 @@ - (BOOL)prefersStatusBarHidden`
`1117`	`1154`
`1118`	`1155`	`void VideoPresentationManagerProxy::setVideoLayerFrame(PlaybackSessionContextIdentifier contextId, WebCore::FloatRect frame)`
`1119`	`1156`	`{`
	`1157`	`+ if (!m_page)`
	`1158`	`+ return;`
	`1159`	`+`
`1120`	`1160`	`auto& [model, interface] = ensureModelAndInterface(contextId);`
`1121`	`1161`	`interface->setCaptionsFrame(CGRectMake(0, 0, frame.width(), frame.height()));`
`1122`	`1162`	`#if PLATFORM(IOS_FAMILY)`
`@@ -1132,17 +1172,20 @@ - (BOOL)prefersStatusBarHidden`
`1132`	`1172`
`1133`	`1173`	`void VideoPresentationManagerProxy::setVideoLayerGravity(PlaybackSessionContextIdentifier contextId, WebCore::MediaPlayerEnums::VideoGravity gravity)`
`1134`	`1174`	`{`
`1135`		`- m_page->send(Messages::VideoPresentationManager::SetVideoLayerGravityEnum(contextId, (unsigned)gravity));`
	`1175`	`+ if (m_page)`
	`1176`	`+ m_page->send(Messages::VideoPresentationManager::SetVideoLayerGravityEnum(contextId, (unsigned)gravity));`
`1136`	`1177`	`}`
`1137`	`1178`
`1138`	`1179`	`void VideoPresentationManagerProxy::fullscreenModeChanged(PlaybackSessionContextIdentifier contextId, WebCore::HTMLMediaElementEnums::VideoFullscreenMode mode)`
`1139`	`1180`	`{`
`1140`		`- m_page->send(Messages::VideoPresentationManager::FullscreenModeChanged(contextId, mode));`
	`1181`	`+ if (m_page)`
	`1182`	`+ m_page->send(Messages::VideoPresentationManager::FullscreenModeChanged(contextId, mode));`
`1141`	`1183`	`}`
`1142`	`1184`
`1143`	`1185`	`void VideoPresentationManagerProxy::fullscreenMayReturnToInline(PlaybackSessionContextIdentifier contextId)`
`1144`	`1186`	`{`
`1145`		`- m_page->send(Messages::VideoPresentationManager::FullscreenMayReturnToInline(contextId, m_page->isViewVisible()));`
	`1187`	`+ if (m_page)`
	`1188`	`+ m_page->send(Messages::VideoPresentationManager::FullscreenMayReturnToInline(contextId, m_page->isViewVisible()));`
`1146`	`1189`	`}`
`1147`	`1190`
`1148`	`1191`	`#endif`