Revert "Cherry-pick 5cdf58d. rdar://121706323"

This reverts commit 9952c70. Identifier: 272448.531@safari-7618.1.15.12-branch
WebKit · Feb 9, 2024 · f9c31bf · f9c31bf
1 parent 9952c70
commit f9c31bf
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 99 deletions.
diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h
@@ -1701,15 +1701,3 @@
     && (PLATFORM(IOS) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 170400)
 #define HAVE_MARKETPLACE_KIT 1
 #endif
-
-#if !defined(HAVE_XPC_API) \
-    && (PLATFORM(MAC) \
-    || ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 170400))
-#define HAVE_XPC_API 1
-#endif
-
-#if !defined(HAVE_BROWSER_ENGINE_SUPPORTING_API) \
-    && (((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 170400) \
-    || (PLATFORM(APPLETV) && __TV_OS_VERSION_MAX_ALLOWED >= 170400))
-#define HAVE_BROWSER_ENGINE_SUPPORTING_API 1
-#endif
diff --git a/Source/WTF/wtf/spi/cocoa/IOSurfaceSPI.h b/Source/WTF/wtf/spi/cocoa/IOSurfaceSPI.h
@@ -96,7 +96,7 @@ WTF_EXTERN_C_END
 
 WTF_EXTERN_C_BEGIN
 
-#if (HAVE(IOSURFACE_SET_OWNERSHIP) || HAVE(IOSURFACE_SET_OWNERSHIP_IDENTITY)) && !HAVE(BROWSER_ENGINE_SUPPORTING_API)
+#if HAVE(IOSURFACE_SET_OWNERSHIP) || HAVE(IOSURFACE_SET_OWNERSHIP_IDENTITY)
 typedef CF_ENUM(int, IOSurfaceMemoryLedgerTags)
 {
     kIOSurfaceMemoryLedgerTagDefault     = 0x00000001,

diff --git a/Source/WTF/wtf/spi/darwin/XPCSPI.h b/Source/WTF/wtf/spi/darwin/XPCSPI.h
@@ -28,7 +28,7 @@
 #include <dispatch/dispatch.h>
 #include <os/object.h>
 
-#if HAVE(XPC_API) || USE(APPLE_INTERNAL_SDK)
+#if PLATFORM(MAC) || USE(APPLE_INTERNAL_SDK)
 #include <xpc/xpc.h>
 #else
 

diff --git a/Source/WebCore/PAL/pal/spi/cocoa/AVFoundationSPI.h b/Source/WebCore/PAL/pal/spi/cocoa/AVFoundationSPI.h
@@ -247,17 +247,16 @@ NS_ASSUME_NONNULL_END
 #endif
 
 #if HAVE(AVCONTENTKEYREQUEST_PENDING_PROTECTION_STATUS)
-#if !HAVE(BROWSER_ENGINE_SUPPORTING_API)
 typedef NS_ENUM(NSInteger, AVExternalContentProtectionStatus) {
     AVExternalContentProtectionStatusPending      = 0,
     AVExternalContentProtectionStatusSufficient   = 1,
     AVExternalContentProtectionStatusInsufficient = 2,
 };
-#endif
+
 @interface AVContentKeyRequest (AVContentKeyRequest_PendingProtectionStatus)
 - (AVExternalContentProtectionStatus)externalContentProtectionStatus;
 @end
-#endif // HAVE(AVCONTENTKEYREQUEST_PENDING_PROTECTION_STATUS)
+#endif
 
 #if HAVE(AVCONTENTKEYREQUEST_COMPATABILITIY_MODE)
 NS_ASSUME_NONNULL_BEGIN
@@ -384,14 +383,7 @@ NS_ASSUME_NONNULL_END
 
 #endif // __has_include(<AVFoundation/AVSampleBufferAudioRenderer.h>)
 
-#if HAVE(BROWSER_ENGINE_SUPPORTING_API)
-#import <AVFoundation/AVVideoPerformanceMetrics.h>
-@interface AVVideoPerformanceMetrics (AVVideoPerformanceMetricsDisplayCompositedVideoFrames)
-@property (nonatomic, readonly) unsigned long numberOfDisplayCompositedVideoFrames;
-@property (nonatomic, readonly) unsigned long numberOfNonDisplayCompositedVideoFrames;
-@property (nonatomic, readonly) double totalFrameDelay;
-@end
-#else
+#if !USE(APPLE_INTERNAL_SDK)
 @interface AVVideoPerformanceMetrics : NSObject
 @property (nonatomic, readonly) unsigned long totalNumberOfVideoFrames;
 @property (nonatomic, readonly) unsigned long numberOfDroppedVideoFrames;
@@ -400,7 +392,12 @@ NS_ASSUME_NONNULL_END
 @property (nonatomic, readonly) unsigned long numberOfNonDisplayCompositedVideoFrames;
 @property (nonatomic, readonly) double totalFrameDelay;
 @end
-#endif // HAVE(BROWSER_ENGINE_SUPPORTING_API)
+#else
+@interface AVVideoPerformanceMetrics (AVVideoPerformanceMetricsDisplayCompositedVideoFrames)
+@property (nonatomic, readonly) unsigned long numberOfDisplayCompositedVideoFrames;
+@property (nonatomic, readonly) unsigned long numberOfNonDisplayCompositedVideoFrames;
+@end
+#endif
 
 #if !USE(APPLE_INTERNAL_SDK) && HAVE(AVAUDIOSESSION) && !PLATFORM(MACCATALYST)
 #import <AVFoundation/AVAudioSession.h>

diff --git a/Source/WebCore/PAL/pal/spi/ios/BrowserEngineKitSPI.h b/Source/WebCore/PAL/pal/spi/ios/BrowserEngineKitSPI.h
diff --git a/Source/WebKit/Platform/spi/ios/UIKitSPI.h b/Source/WebKit/Platform/spi/ios/UIKitSPI.h
@@ -443,10 +443,8 @@ typedef struct CGSVGDocument *CGSVGDocumentRef;
 @property (nonatomic, readonly) UIEdgeInsets _systemContentInset;
 @property (nonatomic, getter=_allowsAsyncScrollEvent, setter=_setAllowsAsyncScrollEvent:) BOOL _allowsAsyncScrollEvent;
 @property (nonatomic, getter=_isFirstResponderKeyboardAvoidanceEnabled, setter=_setFirstResponderKeyboardAvoidanceEnabled:) BOOL firstResponderKeyboardAvoidanceEnabled;
-#if !HAVE(BROWSER_ENGINE_SUPPORTING_API)
 @property (nonatomic) BOOL bouncesHorizontally;
 @property (nonatomic) BOOL bouncesVertically;
-#endif
 @property (nonatomic, setter=_setAllowsParentToBeginHorizontally:) BOOL _allowsParentToBeginHorizontally;
 @property (nonatomic, setter=_setAllowsParentToBeginVertically:) BOOL _allowsParentToBeginVertically;
 @property (nonatomic) BOOL tracksImmediatelyWhileDecelerating;

diff --git a/Tools/TestRunnerShared/spi/UIKitSPIForTesting.h b/Tools/TestRunnerShared/spi/UIKitSPIForTesting.h
@@ -143,7 +143,6 @@ WTF_EXTERN_C_END
 
 @interface UITextSuggestion : NSObject
 @property (nonatomic, copy) NSString *displayText;
-+ (instancetype)textSuggestionWithInputText:(NSString *)inputText;
 @end
 
 @protocol UITextInputTraits_Private <NSObject, UITextInputTraits>
@@ -623,8 +622,8 @@ typedef NS_ENUM(NSInteger, NSTextBlockLayer) {
 @end
 #endif
 
-#if USE(BROWSERENGINEKIT)
-@interface UIKeyEvent : NSObject
+#if HAVE(UI_ASYNC_TEXT_INTERACTION)
+@interface UIKeyEvent (Internal)
 - (instancetype)initWithWebEvent:(WebEvent *)webEvent;
 @property (nonatomic, readonly) WebEvent *webEvent;
 @end