Update to Vision idiom.

https://bugs.webkit.org/show_bug.cgi?id=259907 rdar://113531570 Reviewed by Wenson Hsieh. Updated to new idiom now that reality idiom is deprecated. * Source/WebCore/platform/ios/Device.cpp: (WebCore::deviceClassIsVision): (WebCore::deviceClassIsReality): Deleted. * Source/WebCore/platform/ios/Device.h: * Source/WebCore/platform/ios/LocalCurrentTraitCollection.mm: (WebCore::adjustedTraitCollection): * Source/WebKit/Shared/UserInterfaceIdiom.h: * Source/WebKit/Shared/UserInterfaceIdiom.mm: (WebKit::currentUserInterfaceIdiomIsVision): (WebKit::updateCurrentUserInterfaceIdiom): (WebKit::currentUserInterfaceIdiomIsReality): Deleted. * Source/WebKit/Shared/UserInterfaceIdiom.serialization.in: * Source/WebKit/Shared/WebPreferencesDefaultValues.cpp: (WebKit::defaultAlternateFormControlDesignEnabled): (WebKit::defaultVideoFullscreenRequiresElementFullscreen): * Source/WebKit/UIProcess/Cocoa/WKShareSheet.mm: (-[WKShareSheet presentWithShareDataArray:inRect:]): * Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm: (WebKit::useSpatialFullScreenTransition): Canonical link: https://commits.webkit.org/266673@main
WebKit · Aug 8, 2023 · 9776a6b · 9776a6b
1 parent bc52720
commit 9776a6b
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/Source/WebCore/platform/ios/Device.cpp b/Source/WebCore/platform/ios/Device.cpp
@@ -42,7 +42,7 @@ bool deviceClassIsSmallScreen()
     return deviceClass == MGDeviceClassiPhone || deviceClass == MGDeviceClassiPod || deviceClass == MGDeviceClassWatch;
 }
 
-bool deviceClassIsReality()
+bool deviceClassIsVision()
 {
 #if PLATFORM(VISION)
     static auto deviceClass = MGGetSInt32Answer(kMGQDeviceClassNumber, MGDeviceClassInvalid);

diff --git a/Source/WebCore/platform/ios/Device.h b/Source/WebCore/platform/ios/Device.h
@@ -38,7 +38,7 @@ String deviceName(); // Thread-safe.
 // If a check like this is needed, often currentUserInterfaceIdiomIsSmallScreen is preferred.
 WEBCORE_EXPORT bool deviceClassIsSmallScreen();
 
-WEBCORE_EXPORT bool deviceClassIsReality();
+WEBCORE_EXPORT bool deviceClassIsVision();
 
 // FIXME: How does this differ from !deviceClassIsSmallScreen()?
 WEBCORE_EXPORT bool deviceHasIPadCapability();

diff --git a/Source/WebCore/platform/ios/LocalCurrentTraitCollection.mm b/Source/WebCore/platform/ios/LocalCurrentTraitCollection.mm
@@ -35,9 +35,9 @@
 static UITraitCollection *adjustedTraitCollection(UITraitCollection *traitCollection)
 {
 #if PLATFORM(VISION)
-    // Use the iPad idiom instead of the Reality idiom, since some system colors are transparent
-    // in the Reality idiom, and are not web-compatible.
-    if (traitCollection.userInterfaceIdiom == UIUserInterfaceIdiomReality)
+    // Use the iPad idiom instead of the Vision idiom, since some system colors are transparent
+    // in the Vision idiom, and are not web-compatible.
+    if (traitCollection.userInterfaceIdiom == UIUserInterfaceIdiomVision)
         return [PAL::getUITraitCollectionClass() traitCollectionWithTraitsFromCollections:@[ traitCollection, [PAL::getUITraitCollectionClass() traitCollectionWithUserInterfaceIdiom:UIUserInterfaceIdiomPad] ]];
 #endif
     return traitCollection;

diff --git a/Source/WebKit/Shared/UserInterfaceIdiom.h b/Source/WebKit/Shared/UserInterfaceIdiom.h
@@ -32,11 +32,11 @@ namespace WebKit {
 enum class UserInterfaceIdiom : uint8_t {
     Default,
     SmallScreen,
-    Reality
+    Vision
 };
 
 bool currentUserInterfaceIdiomIsSmallScreen();
-bool currentUserInterfaceIdiomIsReality();
+bool currentUserInterfaceIdiomIsVision();
 
 UserInterfaceIdiom currentUserInterfaceIdiom();
 void setCurrentUserInterfaceIdiom(UserInterfaceIdiom);

diff --git a/Source/WebKit/Shared/UserInterfaceIdiom.mm b/Source/WebKit/Shared/UserInterfaceIdiom.mm
@@ -42,11 +42,11 @@ bool currentUserInterfaceIdiomIsSmallScreen()
     return s_currentUserInterfaceIdiom == UserInterfaceIdiom::SmallScreen;
 }
 
-bool currentUserInterfaceIdiomIsReality()
+bool currentUserInterfaceIdiomIsVision()
 {
     if (!s_currentUserInterfaceIdiom)
         updateCurrentUserInterfaceIdiom();
-    return s_currentUserInterfaceIdiom == UserInterfaceIdiom::Reality;
+    return s_currentUserInterfaceIdiom == UserInterfaceIdiom::Vision;
 }
 
 UserInterfaceIdiom currentUserInterfaceIdiom()
@@ -72,15 +72,15 @@ bool updateCurrentUserInterfaceIdiom()
         if (![UIApplication sharedApplication]) {
             if (WebCore::deviceClassIsSmallScreen())
                 return UserInterfaceIdiom::SmallScreen;
-            if (WebCore::deviceClassIsReality())
-                return UserInterfaceIdiom::Reality;
+            if (WebCore::deviceClassIsVision())
+                return UserInterfaceIdiom::Vision;
         } else {
             auto idiom = [[UIDevice currentDevice] userInterfaceIdiom];
             if (idiom == UIUserInterfaceIdiomPhone || idiom == UIUserInterfaceIdiomWatch)
                 return UserInterfaceIdiom::SmallScreen;
 #if PLATFORM(VISION)
-            if (idiom == UIUserInterfaceIdiomReality)
-                return UserInterfaceIdiom::Reality;
+            if (idiom == UIUserInterfaceIdiomVision)
+                return UserInterfaceIdiom::Vision;
 #endif
         }
 

diff --git a/Source/WebKit/Shared/UserInterfaceIdiom.serialization.in b/Source/WebKit/Shared/UserInterfaceIdiom.serialization.in
@@ -25,7 +25,7 @@
 enum class WebKit::UserInterfaceIdiom : uint8_t {
     Default,
     SmallScreen,
-    Reality
+    Vision
 };
 
 #endif
diff --git a/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp b/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp
@@ -70,12 +70,12 @@ bool defaultShouldPrintBackgrounds()
 
 bool defaultAlternateFormControlDesignEnabled()
 {
-    return currentUserInterfaceIdiomIsReality();
+    return currentUserInterfaceIdiomIsVision();
 }
 
 bool defaultVideoFullscreenRequiresElementFullscreen()
 {
-    return currentUserInterfaceIdiomIsReality();
+    return currentUserInterfaceIdiomIsVision();
 }
 
 #endif

diff --git a/Source/WebKit/UIProcess/Cocoa/WKShareSheet.mm b/Source/WebKit/UIProcess/Cocoa/WKShareSheet.mm
@@ -329,7 +329,7 @@ - (void)presentWithShareDataArray:(NSArray *)sharingItems inRect:(std::optional<
     }];
 
 #if PLATFORM(VISION)
-    if (webView.traitCollection.userInterfaceIdiom == UIUserInterfaceIdiomReality) {
+    if (webView.traitCollection.userInterfaceIdiom == UIUserInterfaceIdiomVision) {
         [_shareSheetViewController setAllowsCustomPresentationStyle:YES];
         [_shareSheetViewController setModalPresentationStyle:UIModalPresentationFormSheet];
     } else

diff --git a/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm b/Source/WebKit/UIProcess/ios/fullscreen/WKFullScreenWindowControllerIOS.mm
@@ -101,7 +101,7 @@ static void replaceViewWithView(UIView *view, UIView *otherView)
 
 static bool useSpatialFullScreenTransition()
 {
-    return [[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomReality;
+    return [[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomVision;
 }
 
 static void resizeScene(UIWindowScene *scene, CGSize size, CompletionHandler<void()>&& completionHandler)