Changeset 287279 in webkit

Timestamp:

Dec 20, 2021, 2:14:50 PM (4 years ago)

Author:

Wenson Hsieh

Message:

Add some missing API availability macros around some WebXR SPI
​https://bugs.webkit.org/show_bug.cgi?id=234521

Reviewed by Tim Horton.

Add some missing API availability macros around some WebXR-related SPI that was introduced in r286318.
Also remove a few unnecessary PLATFORM(COCOA) compile-time guards, and add a missing #import to fix the
non-unified build.

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

(WebKit::UIDelegate::setDelegate):

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-12-20  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Add some missing API availability macros around some WebXR SPI
+        https://bugs.webkit.org/show_bug.cgi?id=234521
+
+        Reviewed by Tim Horton.
+
+        Add some missing API availability macros around some WebXR-related SPI that was introduced in r286318.
+        Also remove a few unnecessary `PLATFORM(COCOA)` compile-time guards, and add a missing `#import` to fix the
+        non-unified build.
+
+        * UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
+        * UIProcess/Cocoa/PlatformXRCoordinator.mm:
+        * UIProcess/Cocoa/UIDelegate.h:
+        * UIProcess/Cocoa/UIDelegate.mm:
+        (WebKit::UIDelegate::setDelegate):
+
 2021-12-20  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -93 +93 @@
     _WKXRSessionModeImmersiveVr,
     _WKXRSessionModeImmersiveAr,
-};
+} WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
 
 typedef NS_OPTIONS(NSUInteger, _WKXRSessionFeatureFlags) {
@@ -102 +102 @@
     _WKXRSessionFeatureFlagsReferenceSpaceTypeBoundedFloor = 1 << 3,
     _WKXRSessionFeatureFlagsReferenceSpaceTypeUnbounded = 1 << 4,
-};
+} WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
 
 @protocol WKUIDelegatePrivate <WKUIDelegate>
@@ -176 +176 @@
 - (void)_webViewDidDisableInspectorBrowserDomain:(WKWebView *)webView WK_API_AVAILABLE(macos(12.0), ios(15.0));
 
-- (void)_webView:(WKWebView *)webView requestPermissionForXRSessionOrigin:(NSString *)originString mode:(_WKXRSessionMode)mode grantedFeatures:(_WKXRSessionFeatureFlags)grantedFeatures consentRequiredFeatures:(_WKXRSessionFeatureFlags)consentRequiredFeatures consentOptionalFeatures:(_WKXRSessionFeatureFlags)consentOptionalFeatures completionHandler:(void (^)(_WKXRSessionFeatureFlags))completionHandler;
+- (void)_webView:(WKWebView *)webView requestPermissionForXRSessionOrigin:(NSString *)originString mode:(_WKXRSessionMode)mode grantedFeatures:(_WKXRSessionFeatureFlags)grantedFeatures consentRequiredFeatures:(_WKXRSessionFeatureFlags)consentRequiredFeatures consentOptionalFeatures:(_WKXRSessionFeatureFlags)consentOptionalFeatures completionHandler:(void (^)(_WKXRSessionFeatureFlags))completionHandler WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
 - (void)_webView:(WKWebView *)webView startXRSessionWithCompletionHandler:(void (^)(id))completionHandler WK_API_AVAILABLE(macos(12.0), ios(15.0));
 - (void)_webView:(WKWebView *)webView requestNotificationPermissionForSecurityOrigin:(WKSecurityOrigin *)securityOrigin decisionHandler:(void (^)(BOOL))decisionHandler WK_API_AVAILABLE(macos(10.13.4), ios(WK_IOS_TBA));

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

@@ -26 +26 @@
 #import "config.h"
 #import "PlatformXRCoordinator.h"
+#import "PlatformXRSystem.h"
 
 #if ENABLE(WEBXR) && USE(APPLE_INTERNAL_SDK)

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

@@ -175 +175 @@
         void didDisableInspectorBrowserDomain(WebPageProxy&) final;
 
-#if ENABLE(WEBXR) && PLATFORM(COCOA)
+#if ENABLE(WEBXR)
         void requestPermissionOnXRSessionFeatures(WebPageProxy&, const WebCore::SecurityOriginData&, PlatformXR::SessionMode, const PlatformXR::Device::FeatureList& /* granted */, const PlatformXR::Device::FeatureList& /* consentRequired */, const PlatformXR::Device::FeatureList& /* consentOptional */, CompletionHandler<void(std::optional<PlatformXR::Device::FeatureList>&&)>&&) final;
         void startXRSession(WebPageProxy&, CompletionHandler<void(RetainPtr<id>)>&&) final;
@@ -269 +269 @@
         bool webViewDidEnableInspectorBrowserDomain : 1;
         bool webViewDidDisableInspectorBrowserDomain : 1;
-#if ENABLE(WEBXR) && PLATFORM(COCOA)
+#if ENABLE(WEBXR)
         bool webViewRequestPermissionForXRSessionOriginModeAndFeaturesWithCompletionHandler: 1;
         bool webViewStartXRSessionWithCompletionHandler : 1;

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

@@ -194 +194 @@
     m_delegateMethods.webViewDidDisableInspectorBrowserDomain = [delegate respondsToSelector:@selector(_webViewDidDisableInspectorBrowserDomain:)];
 
-#if ENABLE(WEBXR) && PLATFORM(COCOA)
+#if ENABLE(WEBXR)
     m_delegateMethods.webViewRequestPermissionForXRSessionOriginModeAndFeaturesWithCompletionHandler = [delegate respondsToSelector:@selector(_webView:requestPermissionForXRSessionOrigin:mode:grantedFeatures:consentRequiredFeatures:consentOptionalFeatures:completionHandler:)];
     m_delegateMethods.webViewStartXRSessionWithCompletionHandler = [delegate respondsToSelector:@selector(_webView:startXRSessionWithCompletionHandler:)];
@@ -1686 +1686 @@
 }
 
-#if ENABLE(WEBXR) && PLATFORM(COCOA)
+#if ENABLE(WEBXR)
 static _WKXRSessionMode toWKXRSessionMode(PlatformXR::SessionMode mode)
 {