Restart XR immersive session foreground activity if needed when proce…

…ss is unsuspended https://bugs.webkit.org/show_bug.cgi?id=260226 rdar://107913685 Reviewed by Chris Dumez and Dean Jackson. The "XR immersive session" foreground activity is added when an XR session starts so the web process has the foreground priority to do rendering work. That activity gets invalidated when the process is suspended. So if the process resumes again while an XR session is still in progress, we need to add that foreground activity again. * Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm: (WebKit::WebProcessPool::setProcessesShouldSuspend): * Source/WebKit/UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::restartXRSessionActivityOnProcessResumeIfNeeded): * Source/WebKit/UIProcess/WebPageProxy.h: * Source/WebKit/UIProcess/XR/PlatformXRSystem.cpp: (WebKit::PlatformXRSystem::ensureImmersiveSessionActivity): (WebKit::PlatformXRSystem::initializeTrackingAndRendering): * Source/WebKit/UIProcess/XR/PlatformXRSystem.h: Canonical link: https://commits.webkit.org/267097@main
WebKit · Aug 21, 2023 · ce151b9 · ce151b9
1 parent e78e75e
commit ce151b9
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 2 deletions.
diff --git a/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm b/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
@@ -1067,8 +1067,16 @@ void setLockdownModeEnabledGloballyForTesting(std::optional<bool> enabledForTest
         return;
 
     m_processesShouldSuspend = shouldSuspend;
-    for (auto& process : m_processes)
+    for (auto& process : m_processes) {
         process->throttler().setAllowsActivities(!m_processesShouldSuspend);
+
+#if ENABLE(WEBXR) && !USE(OPENXR)
+        if (!m_processesShouldSuspend) {
+            for (auto& page : process->pages())
+                page->restartXRSessionActivityOnProcessResumeIfNeeded();
+        }
+#endif
+    }
 }
 
 #endif

diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp
@@ -7422,6 +7422,12 @@ PlatformXRSystem* WebPageProxy::xrSystem() const
 {
     return internals().xrSystem.get();
 }
+
+void WebPageProxy::restartXRSessionActivityOnProcessResumeIfNeeded()
+{
+    if (xrSystem() && xrSystem()->hasActiveSession())
+        xrSystem()->ensureImmersiveSessionActivity();
+}
 #endif
 
 #if ENABLE(INPUT_TYPE_COLOR)

diff --git a/Source/WebKit/UIProcess/WebPageProxy.h b/Source/WebKit/UIProcess/WebPageProxy.h
@@ -2256,6 +2256,7 @@ class WebPageProxy final : public API::ObjectImpl<API::Object::Type::Page>, publ
 
 #if ENABLE(WEBXR) && !USE(OPENXR)
     PlatformXRSystem* xrSystem() const;
+    void restartXRSessionActivityOnProcessResumeIfNeeded();
 #endif
 
 #if ENABLE(INPUT_TYPE_COLOR)

diff --git a/Source/WebKit/UIProcess/XR/PlatformXRSystem.cpp b/Source/WebKit/UIProcess/XR/PlatformXRSystem.cpp
@@ -54,6 +54,14 @@ void PlatformXRSystem::invalidate()
         xrCoordinator()->endSessionIfExists(m_page);
 }
 
+void PlatformXRSystem::ensureImmersiveSessionActivity()
+{
+    if (m_immersiveSessionActivity && m_immersiveSessionActivity->isValid())
+        return;
+
+    m_immersiveSessionActivity = m_page.process().throttler().foregroundActivity("XR immersive session"_s).moveToUniquePtr();
+}
+
 void PlatformXRSystem::enumerateImmersiveXRDevices(CompletionHandler<void(Vector<XRDeviceInfo>&&)>&& completionHandler)
 {
     auto* xrCoordinator = PlatformXRSystem::xrCoordinator();
@@ -91,7 +99,7 @@ void PlatformXRSystem::initializeTrackingAndRendering(const WebCore::SecurityOri
     if (!xrCoordinator)
         return;
 
-    m_immersiveSessionActivity = m_page.process().throttler().foregroundActivity("XR immersive session"_s).moveToUniquePtr();
+    ensureImmersiveSessionActivity();
 
     WeakPtr weakThis { *this };
     xrCoordinator->startSession(m_page, weakThis, securityOriginData, mode, requestedFeatures);

diff --git a/Source/WebKit/UIProcess/XR/PlatformXRSystem.h b/Source/WebKit/UIProcess/XR/PlatformXRSystem.h
@@ -57,6 +57,7 @@ class PlatformXRSystem : public IPC::MessageReceiver, public PlatformXRCoordinat
     void invalidate();
 
     bool hasActiveSession() const { return !!m_immersiveSessionActivity; }
+    void ensureImmersiveSessionActivity();
 
 private:
     static PlatformXRCoordinator* xrCoordinator();