Move UIKit SPI used only for testing into separate header

https://bugs.webkit.org/show_bug.cgi?id=260510
rdar://114242032

Reviewed by Megan Gardner.

Move TestWebKitAPI's existing `Tools/TestWebKitAPI/ios/UIKitSPI.h` into `TestRunnerShared/`, as
`Tools/TestRunnerShared/spi/UIKitSPIForTesting.h`; use this on iOS in WebKitTestRunner,
DumpRenderTree and TestWebKitAPI by augmenting header search paths to include
`Tools/TestRunnerShared/spi/*`.

* Source/WebKit/Platform/spi/ios/UIKitSPI.h:
* Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
* Tools/DumpRenderTree/ios/DumpRenderTreeBrowserView.h:
* Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm:
* Tools/DumpRenderTree/mac/Configurations/Base.xcconfig:
* Tools/DumpRenderTree/mac/DumpRenderTree.mm:
* Tools/DumpRenderTree/mac/DumpRenderTreeWindow.h:
* Tools/DumpRenderTree/mac/TestRunnerMac.mm:
* Tools/TestRunnerShared/cocoa/LayoutTestSpellChecker.mm:
* Tools/TestRunnerShared/spi/UIKitSPIForTesting.h: Renamed from Tools/TestWebKitAPI/ios/UIKitSPI.h.
* Tools/TestWebKitAPI/Configurations/Base.xcconfig:
* Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
* Tools/TestWebKitAPI/Tests/WebKit/AdvancedPrivacyProtections.mm:
* Tools/TestWebKitAPI/Tests/WebKitCocoa/ClipboardTests.mm:
* Tools/TestWebKitAPI/Tests/WebKitCocoa/CopyURL.mm:
* Tools/TestWebKitAPI/Tests/WebKitCocoa/DocumentEditingContext.mm:
* Tools/TestWebKitAPI/Tests/WebKitCocoa/EditorStateTests.mm:
* Tools/TestWebKitAPI/Tests/WebKitCocoa/FindInPage.mm:
* Tools/TestWebKitAPI/Tests/WebKitCocoa/FontAttributes.mm:
* Tools/TestWebKitAPI/Tests/WebKitCocoa/ImageAnalysisTests.mm:
* Tools/TestWebKitAPI/Tests/WebKitCocoa/InsertTextAlternatives.mm:
* Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteboardUtilities.mm:
* Tools/TestWebKitAPI/Tests/WebKitCocoa/SystemColors.mm:
* Tools/TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm:
* Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAppHighlights.mm:
* Tools/TestWebKitAPI/Tests/WebKitCocoa/WKContentViewEditingActions.mm:
* Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewEditActions.mm:
* Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewFindString.mm:
* Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewGetContents.mm:
* Tools/TestWebKitAPI/Tests/WebKitCocoa/iOSMouseSupport.mm:
* Tools/TestWebKitAPI/Tests/WebKitCocoa/iOSStylusSupport.mm:
* Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/DateTimeInputsAccessoryViewTests.mm:
* Tools/TestWebKitAPI/Tests/WebKitLegacy/ios/ScrollToRevealSelection.mm:
* Tools/TestWebKitAPI/Tests/ios/ActionSheetTests.mm:
* Tools/TestWebKitAPI/Tests/ios/AutocorrectionTestsIOS.mm:
* Tools/TestWebKitAPI/Tests/ios/CustomContentViewGestures.mm:
* Tools/TestWebKitAPI/Tests/ios/DragAndDropTestsIOS.mm:
* Tools/TestWebKitAPI/Tests/ios/EnterKeyHintTests.mm:
* Tools/TestWebKitAPI/Tests/ios/FocusPreservationTests.mm:
* Tools/TestWebKitAPI/Tests/ios/KeyboardInputTestsIOS.mm:
* Tools/TestWebKitAPI/Tests/ios/NavigationSwipeTests.mm:
* Tools/TestWebKitAPI/Tests/ios/OverflowScrollViewTests.mm:
* Tools/TestWebKitAPI/Tests/ios/ScrollViewInsetTests.mm:
* Tools/TestWebKitAPI/Tests/ios/SelectionByWord.mm:
* Tools/TestWebKitAPI/Tests/ios/SelectionModifyByParagraphBoundary.mm:
* Tools/TestWebKitAPI/Tests/ios/TextAlternatives.mm:
* Tools/TestWebKitAPI/Tests/ios/TextAutosizingBoost.mm:
* Tools/TestWebKitAPI/Tests/ios/TextServicesTests.mm:
* Tools/TestWebKitAPI/Tests/ios/TextStyleFontSize.mm:
* Tools/TestWebKitAPI/Tests/ios/TouchEventTests.mm:
* Tools/TestWebKitAPI/Tests/ios/UIPasteboardTests.mm:
* Tools/TestWebKitAPI/Tests/ios/UIWKInteractionViewProtocol.mm:
* Tools/TestWebKitAPI/Tests/ios/UserInterfaceIdiomUpdate.mm:
* Tools/TestWebKitAPI/Tests/ios/WKScrollViewTests.mm:
* Tools/TestWebKitAPI/Tests/ios/WKWebViewAutofillTests.mm:
* Tools/TestWebKitAPI/cocoa/DragAndDropSimulator.h:
* Tools/TestWebKitAPI/cocoa/TestContextMenuDriver.mm:
* Tools/TestWebKitAPI/cocoa/TestWKWebView.mm:
* Tools/TestWebKitAPI/ios/DragAndDropSimulatorIOS.mm:
* Tools/TestWebKitAPI/ios/UserInterfaceSwizzler.h:
* Tools/WebKitTestRunner/Configurations/Base.xcconfig:
* Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
* Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.mm:
* Tools/WebKitTestRunner/ios/GeneratedTouchesDebugWindow.mm:
* Tools/WebKitTestRunner/ios/HIDEventGenerator.h:
* Tools/WebKitTestRunner/ios/HIDEventGenerator.mm:
* Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm:
* Tools/WebKitTestRunner/ios/TestControllerIOS.mm:
* Tools/WebKitTestRunner/ios/UIKitSPIForTesting.h: Removed.
* Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm:
* Tools/WebKitTestRunner/ios/mainIOS.mm:

Canonical link: https://commits.webkit.org/268564@main

Source/WebKit/Platform/spi/ios/UIKitSPI.h

@@ -51,7 +51,6 @@
 #import <UIKit/UIKeyboardImpl.h>
 #import <UIKit/UIKeyboardInputModeController.h>
 #import <UIKit/UIKeyboardIntl.h>
-#import <UIKit/UIKeyboardPreferencesController.h>
 #import <UIKit/UIKeyboard_Private.h>
 #import <UIKit/UILongPressGestureRecognizer_Private.h>
 #import <UIKit/UIMenuController_Private.h>
@@ -87,7 +86,6 @@
 #import <UIKit/UIWKTextInteractionAssistant.h>
 #import <UIKit/UIWebBrowserView.h>
 #import <UIKit/UIWebDocumentView.h>
-#import <UIKit/UIWebScrollView.h>
 #import <UIKit/UIWebTiledView.h>
 #import <UIKit/UIWindowScene_Private.h>
 #import <UIKit/UIWindow_Private.h>
@@ -213,41 +211,25 @@ typedef struct __IOHIDEvent* IOHIDEventRef;
 typedef struct __GSKeyboard* GSKeyboardRef;
 WTF_EXTERN_C_END
 
-@class UIPressInfo;
-
 @interface UIApplication ()
 - (UIInterfaceOrientation)interfaceOrientation;
 - (void)_cancelAllTouches;
-- (CGFloat)statusBarHeight;
 - (BOOL)isSuspendedUnderLock;
 - (void)_enqueueHIDEvent:(IOHIDEventRef)event;
-- (void)_handleHIDEvent:(IOHIDEventRef)event;
 - (BOOL)_appAdoptsUISceneLifecycle;
 @end
 
 @interface UIColor ()
 + (UIColor *)systemBackgroundColor;
 @end
 
-@interface UIDevice ()
-- (void)setOrientation:(UIDeviceOrientation)orientation animated:(BOOL)animated;
-@property (nonatomic, readonly, retain) NSString *buildVersion;
-@end
-
 typedef enum {
     kUIKeyboardInputRepeat                 = 1 << 0,
-    kUIKeyboardInputPopupVariant           = 1 << 1,
-    kUIKeyboardInputMultitap               = 1 << 2,
-    kUIKeyboardInputSkipCandidateSelection = 1 << 3,
-    kUIKeyboardInputDeadKey                = 1 << 4,
     kUIKeyboardInputModifierFlagsChanged   = 1 << 5,
-    kUIKeyboardInputFlick                  = 1 << 6,
-    kUIKeyboardInputPreProcessed           = 1 << 7,
 } UIKeyboardInputFlags;
 
 #if PLATFORM(IOS) && !defined(__IPHONE_13_4)
 typedef NS_OPTIONS(NSInteger, UIEventButtonMask) {
-    UIEventButtonMaskPrimary = 1 << 0,
     UIEventButtonMaskSecondary = 1 << 1,
 };
 #endif
@@ -257,7 +239,6 @@ typedef NS_OPTIONS(NSInteger, UIEventButtonMask) {
 - (NSString *)_unmodifiedInput;
 - (NSString *)_modifiedInput;
 - (BOOL)_isKeyDown;
-- (UIEventButtonMask)_buttonMask;
 @end
 
 #if HAVE(UIFINDINTERACTION)
@@ -369,7 +350,6 @@ typedef struct CGSVGDocument *CGSVGDocumentRef;
 @interface UIKeyboardImpl : UIView <UIKeyboardCandidateListDelegate>
 + (BOOL)smartInsertDeleteIsEnabled;
 - (void)updateForChangedSelection;
-- (void)setCorrectionLearningAllowed:(BOOL)allowed;
 @end
 
 @interface UIKeyboardImpl ()
@@ -383,8 +363,6 @@ typedef struct CGSVGDocument *CGSVGDocumentRef;
 - (void)addInputString:(NSString *)string withFlags:(NSUInteger)flags;
 - (void)addInputString:(NSString *)string withFlags:(NSUInteger)flags withInputManagerHint:(NSString *)hint;
 - (BOOL)autocorrectSpellingEnabled;
-- (BOOL)isAutoShifted;
-- (void)dismissKeyboard;
 - (void)clearShiftState;
 - (void)deleteFromInput;
 - (void)deleteFromInputWithFlags:(NSUInteger)flags;
@@ -449,7 +427,6 @@ typedef struct CGSVGDocument *CGSVGDocumentRef;
 
 @class FBSDisplayConfiguration;
 @interface UIScreen ()
-- (void)_setScale:(CGFloat)scale;
 @property (nonatomic, readonly, retain) FBSDisplayConfiguration *displayConfiguration;
 @end
 
@@ -501,7 +478,6 @@ typedef NS_ENUM(NSUInteger, UIScrollPhase) {
 @property (nonatomic, getter=_allowableSeparation, setter=_setAllowableSeparation:) CGFloat allowableSeparation;
 @property (nonatomic, readonly) CGPoint location;
 @property (nonatomic) CGFloat allowableMovement;
-@property (nonatomic) CFTimeInterval maximumIntervalBetweenSuccessiveTaps;
 @end
 
 @class WebEvent;
@@ -577,10 +553,6 @@ typedef enum {
 - (void)setSuggestions:(NSArray <UITextSuggestion*> *)suggestions;
 @end
 
-@interface UIViewController ()
-- (BOOL)isPerformingModalTransition;
-@end
-
 @interface UIViewController (ViewService)
 - (pid_t)_hostProcessIdentifier;
 @property (readonly) NSString *_hostApplicationBundleIdentifier;
@@ -637,7 +609,6 @@ typedef enum {
 - (void)insertSubview:(UIView *)view above:(UIView *)sibling;
 - (void)_didRemoveSubview:(UIView *)subview;
 - (CGSize)convertSize:(CGSize)size toView:(UIView *)view;
-- (void)_removeAllAnimations:(BOOL)includeSubviews;
 - (UIColor *)_inheritedInteractionTintColor;
 - (NSString *)recursiveDescription;
 @end
@@ -839,9 +810,6 @@ typedef NS_ENUM(NSInteger, UIWKGestureType) {
 - (uint32_t)_contextId;
 @end
 
-@interface UIWebScrollView : UIScrollView
-@end
-
 @interface UIWebTiledView : UIView
 @end
 
@@ -922,11 +890,9 @@ typedef enum {
 - (id)_initWithAsynchronousLoading:(BOOL)asynchronousLoading;
 - (BOOL)_doneLoading;
 - (NSRange)rangeOfMisspelledWordInString:(NSString *)stringToCheck range:(NSRange)range startingAt:(NSInteger)startingOffset wrap:(BOOL)wrapFlag languages:(NSArray *)languagesArray;
-- (NSArray<NSTextAlternatives *> *)grammarAlternativesForString:(NSString *)string;
 @end
 
 @interface UIKeyboardInputMode : UITextInputMode <NSCopying>
-+ (UIKeyboardInputMode *)keyboardInputModeWithIdentifier:(NSString *)identifier;
 @property (nonatomic, readonly, retain) NSArray <NSString *> *multilingualLanguages;
 @property (nonatomic, readonly, retain) NSString *languageWithRegion;
 @end
@@ -978,16 +944,6 @@ WTF_EXTERN_C_END
 
 #endif
 
-@protocol TIPreferencesControllerActions;
-
-@interface UIKeyboardPreferencesController : NSObject
-+ (UIKeyboardPreferencesController *)sharedPreferencesController;
-- (void)setValue:(id)value forPreferenceKey:(NSString *)key;
-- (BOOL)boolForPreferenceKey:(NSString *)key;
-- (id)valueForPreferenceKey:(NSString *)key;
-@property (nonatomic, readonly) UIKeyboardPreferencesController<TIPreferencesControllerActions> *preferencesActions;
-@end
-
 @interface UIAutoRotatingWindow : UIApplicationRotationFollowingWindow
 @end
 
@@ -1171,8 +1127,6 @@ typedef NS_ENUM(NSUInteger, _UIScrollDeviceCategory) {
 @end
 
 @interface UIPhysicalKeyboardEvent ()
-+ (UIPhysicalKeyboardEvent *)_eventWithInput:(NSString *)input inputFlags:(UIKeyboardInputFlags)flags;
-- (void)_setHIDEvent:(IOHIDEventRef)event keyboard:(GSKeyboardRef)gsKeyboard;
 - (UIPhysicalKeyboardEvent *)_cloneEvent NS_RETURNS_RETAINED;
 @property (nonatomic, readonly) UIKeyboardInputFlags _inputFlags;
 @property (nonatomic, readonly) CFIndex _keyCode;
@@ -1192,7 +1146,6 @@ typedef NS_ENUM(NSUInteger, _UIScrollDeviceCategory) {
 - (CGPoint)accessibilityConvertPointFromSceneReferenceCoordinates:(CGPoint)point;
 - (CGRect)accessibilityConvertRectToSceneReferenceCoordinates:(CGRect)rect;
 - (UIRectEdge)_edgesApplyingSafeAreaInsetsToContentInset;
-- (void)_updateSafeAreaInsets;
 @end
 
 @interface UIScrollView (IPI)
@@ -1214,22 +1167,8 @@ typedef NS_ENUM(NSUInteger, _UIScrollDeviceCategory) {
 - (CGFloat)getVerticalOverlapForView:(UIView *)view usingKeyboardInfo:(NSDictionary *)info;
 @end
 
-@class TIKeyboardCandidate;
-@class TIKeyboardInput;
-
 @interface UIKeyboardImpl (IPI)
 - (void)setInitialDirection;
-- (void)prepareKeyboardInputModeFromPreferences:(UIKeyboardInputMode *)lastUsedMode;
-- (void)syncInputManagerToAcceptedAutocorrection:(TIKeyboardCandidate *)autocorrection forInput:(TIKeyboardInput *)inputEvent;
-@property (nonatomic, readonly) UIKeyboardInputMode *currentInputModeInPreference;
-@end
-
-@interface UIApplication (IPI)
-- (UIPressInfo *)_pressInfoForPhysicalKeyboardEvent:(UIPhysicalKeyboardEvent *)physicalKeyboardEvent;
-@end
-
-@interface UIPress (IPI)
-- (void)_loadStateFromPressInfo:(UIPressInfo *)pressInfo;
 @end
 
 @class CALayerHost;
@@ -1317,7 +1256,7 @@ typedef NS_ENUM(NSUInteger, _UIScrollDeviceCategory) {
 
 @end
 
-#endif
+#endif // HAVE(UIFINDINTERACTION)
 
 #if HAVE(AUTOCORRECTION_ENHANCEMENTS)
 @interface UIWKDocumentContext (Staging_112795757)
@@ -1341,14 +1280,9 @@ extern NSString * const UIKeyboardPrivateDidRequestDismissalNotification;
 extern NSString * const UIKeyboardIsLocalUserInfoKey;
 
 BOOL _UIApplicationIsExtension(void);
-void _UIApplicationLoadWebKit(void);
 
 void UIImageDataWriteToSavedPhotosAlbum(NSData *imageData, id completionTarget, SEL completionSelector, void *contextInfo);
 
-extern const float UIWebViewGrowsAndShrinksToFitHeight;
-extern const float UIWebViewScalesToFitScale;
-extern const float UIWebViewStandardViewportWidth;
-
 extern const NSString *UIPreviewDataLink;
 extern const NSString *UIPreviewDataDDResult;
 extern const NSString *UIPreviewDataDDContext;

Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj

@@ -308,7 +308,6 @@
 		A134E53718905F4C00901D06 /* AccessibilityCommonMac.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AccessibilityCommonMac.h; path = mac/AccessibilityCommonMac.h; sourceTree = "<group>"; };
 		A134E5391890671C00901D06 /* DumpRenderTreeLibrary.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = DumpRenderTreeLibrary.xcconfig; path = mac/Configurations/DumpRenderTreeLibrary.xcconfig; sourceTree = "<group>"; };
 		A16CD20D18907A7D0092363E /* BaseTarget.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = BaseTarget.xcconfig; path = mac/Configurations/BaseTarget.xcconfig; sourceTree = "<group>"; };
-		A17A5A2C22A881090065C5F0 /* PencilKitTestSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PencilKitTestSPI.h; sourceTree = "<group>"; };
 		A17A5A2D22A881090065C5F0 /* AppKitTestSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppKitTestSPI.h; sourceTree = "<group>"; };
 		A17A5A2E22A881090065C5F0 /* CoreGraphicsTestSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CoreGraphicsTestSPI.h; sourceTree = "<group>"; };
 		A19317FC1892855F001C52B1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = ios/Info.plist; sourceTree = "<group>"; };
@@ -398,6 +397,7 @@
 		F4C3578920E8442700FA0748 /* LayoutTestSpellChecker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayoutTestSpellChecker.h; sourceTree = "<group>"; };
 		F4D4235F1DD5045300678290 /* TextInputControllerIOS.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TextInputControllerIOS.m; path = ios/TextInputControllerIOS.m; sourceTree = "<group>"; };
 		F4D423601DD5046900678290 /* TextInputController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextInputController.h; sourceTree = "<group>"; };
+		F4F289562AC4F5B70084A38D /* UIKitSPIForTesting.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UIKitSPIForTesting.h; sourceTree = "<group>"; };
 		F4FED31E23582158003C139C /* NSPasteboardAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NSPasteboardAdditions.h; path = mac/NSPasteboardAdditions.h; sourceTree = "<group>"; };
 		F4FED31F23582158003C139C /* NSPasteboardAdditions.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NSPasteboardAdditions.mm; path = mac/NSPasteboardAdditions.mm; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -712,7 +712,7 @@
 			children = (
 				A17A5A2D22A881090065C5F0 /* AppKitTestSPI.h */,
 				A17A5A2E22A881090065C5F0 /* CoreGraphicsTestSPI.h */,
-				A17A5A2C22A881090065C5F0 /* PencilKitTestSPI.h */,
+				F4F289562AC4F5B70084A38D /* UIKitSPIForTesting.h */,
 			);
 			path = spi;
 			sourceTree = "<group>";

Tools/DumpRenderTree/ios/DumpRenderTreeBrowserView.h

@@ -24,7 +24,7 @@
  */
 
 
-#import "UIKitSPI.h"
+#import "UIKitSPIForTesting.h"
 
 @interface DumpRenderTreeBrowserView : UIWebBrowserView {
     BOOL _scrollingUsesUIWebScrollView;

Tools/DumpRenderTree/ios/PixelDumpSupportIOS.mm

@@ -32,7 +32,7 @@
 #import "DumpRenderTree.h"
 #import "DumpRenderTreeWindow.h"
 #import "PixelDumpSupportCG.h"
-#import "UIKitSPI.h"
+#import "UIKitSPIForTesting.h"
 
 #define COMMON_DIGEST_FOR_OPENSSL
 #import <CommonCrypto/CommonDigest.h>

Tools/DumpRenderTree/mac/Configurations/Base.xcconfig

@@ -90,7 +90,7 @@ OTHER_CFLAGS = $(inherited) -isystem $(SDKROOT)/System/Library/Frameworks/System
 FRAMEWORK_SEARCH_PATHS = $(inherited) $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR) $(SDK_DIR)$(NORMAL_UMBRELLA_FRAMEWORKS_DIR);
 SYSTEM_FRAMEWORK_SEARCH_PATHS = $(inherited) $(WK_PRIVATE_SDK_DIR)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
 
-HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(WEBCORE_TEST_SUPPORT_DIR) $(SDK_DIR)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(WK_LIBRARY_HEADERS_FOLDER_PATH) ForwardingHeaders $(HEADER_SEARCH_PATHS_$(WK_COCOA_TOUCH));
+HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(WEBCORE_TEST_SUPPORT_DIR) $(SDK_DIR)$(WK_ALTERNATE_WEBKIT_SDK_PATH)$(WK_LIBRARY_HEADERS_FOLDER_PATH) ForwardingHeaders $(HEADER_SEARCH_PATHS_$(WK_COCOA_TOUCH)) $(SRCROOT)/../TestRunnerShared/spi;
 HEADER_SEARCH_PATHS_ = mac/InternalHeaders $(SRCROOT)/../../Source/WebKitLegacy/mac/WebView;
 HEADER_SEARCH_PATHS_cocoatouch = $(SRCROOT)/../../Source/WebKit/Platform/spi/ios;
 

Tools/DumpRenderTree/mac/DumpRenderTree.mm

@@ -118,7 +118,7 @@
 #if PLATFORM(IOS_FAMILY)
 #import "DumpRenderTreeBrowserView.h"
 #import "IOSLayoutTestCommunication.h"
-#import "UIKitSPI.h"
+#import "UIKitSPIForTesting.h"
 #import <QuartzCore/QuartzCore.h>
 #import <WebKit/WAKWindow.h>
 #import <WebKit/WebCoreThread.h>

Tools/DumpRenderTree/mac/DumpRenderTreeWindow.h

@@ -31,7 +31,7 @@
 #if !PLATFORM(IOS_FAMILY)
 #import <AppKit/AppKit.h>
 #else
-#import "UIKitSPI.h"
+#import "UIKitSPIForTesting.h"
 #import <WebKit/WAKWindow.h>
 #endif
 

Tools/DumpRenderTree/mac/TestRunnerMac.mm

@@ -80,7 +80,7 @@
 #import <wtf/WallTime.h>
 
 #if PLATFORM(IOS_FAMILY)
-#import "UIKitSPI.h"
+#import "UIKitSPIForTesting.h"
 #import <WebKit/WebCoreThread.h>
 #import <WebKit/WebCoreThreadMessage.h>
 #import <WebKit/WebDOMOperationsPrivate.h>

Tools/TestRunnerShared/cocoa/LayoutTestSpellChecker.mm

@@ -33,7 +33,7 @@
 #import <wtf/BlockPtr.h>
 
 #if PLATFORM(IOS_FAMILY)
-#import "UIKitSPI.h"
+#import "UIKitSPIForTesting.h"
 #endif
 
 #if PLATFORM(MAC)