Changeset 276160 in webkit

Timestamp:

Apr 16, 2021, 12:39:03 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Add WKUIDelegate SPI for starting XR session
​https://bugs.webkit.org/show_bug.cgi?id=224634

Patch by Ada Chan <​ada.chan@apple.com> on 2021-04-16
Reviewed by Tim Horton.

• UIProcess/API/APIUIClient.h:

(API::UIClient::startXRSession):

• UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
• UIProcess/Cocoa/UIDelegate.h:
• UIProcess/Cocoa/UIDelegate.mm:

(WebKit::UIDelegate::setDelegate):
(WebKit::UIDelegate::UIClient::startXRSession):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/APIUIClient.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKUIDelegatePrivate.h (modified) (1 diff)
• UIProcess/Cocoa/UIDelegate.h (modified) (2 diffs)
• UIProcess/Cocoa/UIDelegate.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-04-16  Ada Chan  <ada.chan@apple.com>
+
+        Add WKUIDelegate SPI for starting XR session
+        https://bugs.webkit.org/show_bug.cgi?id=224634
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/APIUIClient.h:
+        (API::UIClient::startXRSession):
+        * UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
+        * UIProcess/Cocoa/UIDelegate.h:
+        * UIProcess/Cocoa/UIDelegate.mm:
+        (WebKit::UIDelegate::setDelegate):
+        (WebKit::UIDelegate::UIClient::startXRSession):
+
 2021-04-16  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/API/APIUIClient.h

@@ -209 +209 @@
     virtual void decidePolicyForMediaKeySystemPermissionRequest(WebKit::WebPageProxy& page, API::SecurityOrigin& origin, const WTF::String& keySystem, CompletionHandler<void(bool)>&& completionHandler) { page.requestMediaKeySystemPermissionByDefaultAction(origin.securityOrigin(), WTFMove(completionHandler)); }
 
+#if ENABLE(WEBXR) && PLATFORM(COCOA)
+    virtual void startXRSession(WebKit::WebPageProxy&, CompletionHandler<void(RetainPtr<id>)>&& completionHandler) { completionHandler(nil); }
+#endif
 };
 

trunk/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h

@@ -157 +157 @@
 - (void)_webViewDidEnableInspectorBrowserDomain:(WKWebView *)webView WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
 - (void)_webViewDidDisableInspectorBrowserDomain:(WKWebView *)webView WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
+
+- (void)_webView:(WKWebView *)webView startXRSessionWithCompletionHandler:(void (^)(id))completionHandler WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
 
 #if TARGET_OS_IPHONE

trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.h

@@ -167 +167 @@
         void didDisableInspectorBrowserDomain(WebPageProxy&) final;
 
+#if ENABLE(WEBXR) && PLATFORM(COCOA)
+        void startXRSession(WebPageProxy&, CompletionHandler<void(RetainPtr<id>)>&&) final;
+#endif
+
         WeakPtr<UIDelegate> m_uiDelegate;
     };
@@ -256 +260 @@
         bool webViewDidEnableInspectorBrowserDomain : 1;
         bool webViewDidDisableInspectorBrowserDomain : 1;
+#if ENABLE(WEBXR) && PLATFORM(COCOA)
+        bool webViewStartXRSessionWithCompletionHandler : 1;
+#endif
     } m_delegateMethods;
 };

trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm

@@ -188 +188 @@
     m_delegateMethods.webViewDidEnableInspectorBrowserDomain = [delegate respondsToSelector:@selector(_webViewDidEnableInspectorBrowserDomain:)];
     m_delegateMethods.webViewDidDisableInspectorBrowserDomain = [delegate respondsToSelector:@selector(_webViewDidDisableInspectorBrowserDomain:)];
+
+#if ENABLE(WEBXR) && PLATFORM(COCOA)
+    m_delegateMethods.webViewStartXRSessionWithCompletionHandler = [delegate respondsToSelector:@selector(_webView:startXRSessionWithCompletionHandler:)];
+#endif
 }
 
@@ -1655 +1659 @@
 }
 
+#if ENABLE(WEBXR) && PLATFORM(COCOA)
+void UIDelegate::UIClient::startXRSession(WebPageProxy&, CompletionHandler<void(RetainPtr<id>)>&& completionHandler)
+{
+    if (!m_uiDelegate || !m_uiDelegate->m_delegateMethods.webViewStartXRSessionWithCompletionHandler) {
+        completionHandler(nil);
+        return;
+    }
+
+    auto delegate = (id <WKUIDelegatePrivate>)m_uiDelegate->m_delegate.get();
+    if (!delegate) {
+        completionHandler(nil);
+        return;
+    }
+
+    auto checker = CompletionHandlerCallChecker::create(delegate, @selector(_webView:startXRSessionWithCompletionHandler:));
+    [delegate _webView:m_uiDelegate->m_webView.get().get() startXRSessionWithCompletionHandler:makeBlockPtr([completionHandler = WTFMove(completionHandler), checker = WTFMove(checker)] (id result) mutable {
+        if (checker->completionHandlerHasBeenCalled())
+            return;
+        checker->didCallCompletionHandler();
+        completionHandler(result);
+    }).get()];
+}
+#endif
+
 } // namespace WebKit