Consolidate WebKit UIKitSPI.h and UIKitTestSPI.h
authordbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 13 Nov 2018 17:35:56 +0000 (17:35 +0000)
committerdbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 13 Nov 2018 17:35:56 +0000 (17:35 +0000)
https://bugs.webkit.org/show_bug.cgi?id=173341
<rdar://problem/32752890>

Reviewed by Simon Fraser.

Source/WebKit:

* Platform/spi/ios/UIKitSPI.h:

Tools:

There is little value to making a distinction between forward declarations
of UIKit SPI needed in the WebKit layer and just for testing. Moreover,
the contents of these two headers can conflict with each other following
r218275 as DumpRenderTree includes both headers. Instead we should remove
UIKitTestSPI.h and have WebKitTestRunner include the WebKit variant, UIKitSPI.h.

* DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
* DumpRenderTree/mac/DumpRenderTree.mm:
* TestRunnerShared/spi/UIKitTestSPI.h: Removed.
* WebKitTestRunner/Configurations/Base.xcconfig:
* WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
* WebKitTestRunner/cocoa/TestRunnerWKWebView.mm:
* WebKitTestRunner/ios/GeneratedTouchesDebugWindow.mm:
* WebKitTestRunner/ios/HIDEventGenerator.h:
* WebKitTestRunner/ios/HIDEventGenerator.mm:
* WebKitTestRunner/ios/PlatformWebViewIOS.mm:
* WebKitTestRunner/ios/TestControllerIOS.mm:
* WebKitTestRunner/ios/UIScriptControllerIOS.mm:
* WebKitTestRunner/ios/mainIOS.mm:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@238134 268f45cc-cd09-0410-ab3c-d52691b4dbfc

16 files changed:
Source/WebKit/ChangeLog
Source/WebKit/Platform/spi/ios/UIKitSPI.h
Tools/ChangeLog
Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj
Tools/DumpRenderTree/mac/DumpRenderTree.mm
Tools/TestRunnerShared/spi/UIKitTestSPI.h [deleted file]
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/UIScriptControllerIOS.mm
Tools/WebKitTestRunner/ios/mainIOS.mm

index f36aaf8..2882587 100644 (file)
@@ -1,3 +1,13 @@
+2018-11-13  Daniel Bates  <dabates@apple.com>
+
+        Consolidate WebKit UIKitSPI.h and UIKitTestSPI.h
+        https://bugs.webkit.org/show_bug.cgi?id=173341
+        <rdar://problem/32752890>
+
+        Reviewed by Simon Fraser.
+
+        * Platform/spi/ios/UIKitSPI.h:
+
 2018-11-13  Alex Christensen  <achristensen@webkit.org>
 
         Fix internal builds after r238115
index 0192ffb..275fa5f 100644 (file)
@@ -78,6 +78,7 @@
 #import <UIKit/UIWebTiledView.h>
 #import <UIKit/UIWebTouchEventsGestureRecognizer.h>
 #import <UIKit/UIWindow_Private.h>
+#import <UIKit/_UIApplicationRotationFollowing.h>
 #import <UIKit/_UIBackdropViewSettings.h>
 #import <UIKit/_UIBackdropView_Private.h>
 #import <UIKit/_UIHighlightView.h>
@@ -156,11 +157,17 @@ typedef NS_ENUM(NSInteger, UIPreviewItemType) {
 @property (nonatomic) UIAlertControllerStyle preferredStyle;
 @end
 
+WTF_EXTERN_C_BEGIN
+typedef struct __IOHIDEvent * IOHIDEventRef;
+WTF_EXTERN_C_END
+
 @interface UIApplication ()
 - (UIInterfaceOrientation)interfaceOrientation;
 - (void)_cancelAllTouches;
 - (CGFloat)statusBarHeight;
 - (BOOL)isSuspendedUnderLock;
+- (void)_enqueueHIDEvent:(IOHIDEventRef)event;
+- (void)_handleHIDEvent:(IOHIDEventRef)event;
 @end
 
 typedef NS_ENUM(NSInteger, UIDatePickerPrivateMode)  {
@@ -172,6 +179,7 @@ typedef NS_ENUM(NSInteger, UIDatePickerPrivateMode)  {
 @end
 
 @interface UIDevice ()
+- (void)setOrientation:(UIDeviceOrientation)orientation animated:(BOOL)animated;
 @property (nonatomic, readonly, retain) NSString *buildVersion;
 @end
 
@@ -238,12 +246,8 @@ typedef enum {
 - (void)candidateListShouldBeDismissed:(id)candidateList;
 @end
 
-// FIXME: https://bugs.webkit.org/show_bug.cgi?id=173341
-#ifndef _WEBKIT_UIKITSPI_UIKEYBOARD
-#define _WEBKIT_UIKITSPI_UIKEYBOARD 1
 @interface UIKeyboard : UIView <UIKeyboardImplGeometryDelegate>
 @end
-#endif
 
 @interface UIKeyboard ()
 + (CGSize)defaultSizeForInterfaceOrientation:(UIInterfaceOrientation)orientation;
@@ -251,6 +255,7 @@ typedef enum {
 - (void)geometryChangeDone:(BOOL)keyboardVisible;
 - (void)prepareForGeometryChange;
 + (BOOL)isInHardwareKeyboardMode;
++ (void)removeAllDynamicDictionaries;
 @end
 
 @interface UIKeyboardImpl : UIView <UIKeyboardCandidateListDelegate>
@@ -318,6 +323,7 @@ typedef enum {
 
 @class FBSDisplayConfiguration;
 @interface UIScreen ()
+- (void)_setScale:(CGFloat)scale;
 @property (nonatomic, readonly, retain) FBSDisplayConfiguration *displayConfiguration;
 @end
 
@@ -495,6 +501,7 @@ typedef NS_ENUM (NSInteger, _UIBackdropMaskViewFlags) {
 - (void)insertSubview:(UIView *)view above:(UIView *)sibling;
 - (void)viewWillMoveToSuperview:(UIView *)newSuperview;
 - (CGSize)convertSize:(CGSize)size toView:(UIView *)view;
+- (void)_removeAllAnimations:(BOOL)includeSubviews;
 @end
 
 @interface UIWebSelectionView : UIView
@@ -814,6 +821,7 @@ typedef NS_ENUM(NSInteger, _UIBackdropViewStylePrivate) {
 + (BKSAnimationFenceHandle *)_synchronizedDrawingFence;
 + (mach_port_t)_synchronizeDrawingAcrossProcesses;
 - (void)_setWindowResolution:(CGFloat)resolution displayIfChanged:(BOOL)displayIfChanged;
+- (uint32_t)_contextId;
 @end
 
 @interface UIWebScrollView : UIScrollView
@@ -914,6 +922,15 @@ typedef enum {
 @property (readwrite, retain) UIKeyboardInputMode *currentInputMode;
 @end
 
+@interface UIApplicationRotationFollowingWindow : UIWindow
+@end
+
+@interface UIApplicationRotationFollowingController : UIViewController
+@end
+
+@interface UIApplicationRotationFollowingControllerNoTouches : UIApplicationRotationFollowingController
+@end
+
 #if ENABLE(DRAG_SUPPORT)
 
 @interface UIItemProvider : NSItemProvider
@@ -952,8 +969,6 @@ typedef NS_OPTIONS(NSUInteger, UIDragOperation)
 + (void)fadeSharedCalloutBar;
 @end
 
-@interface UIApplicationRotationFollowingWindow : UIWindow
-@end
 @interface UIAutoRotatingWindow : UIApplicationRotationFollowingWindow
 @end
 
@@ -1022,6 +1037,7 @@ typedef NSInteger UICompositingMode;
 - (CGPoint)accessibilityConvertPointFromSceneReferenceCoordinates:(CGPoint)point;
 - (CGRect)accessibilityConvertRectToSceneReferenceCoordinates:(CGRect)rect;
 - (UIRectEdge)_edgesApplyingSafeAreaInsetsToContentInset;
+- (void)_updateSafeAreaInsets;
 @end
 
 @interface UIScrollView (IPI)
index 1f9adb3..03cf9cf 100644 (file)
@@ -1,3 +1,31 @@
+2018-11-13  Daniel Bates  <dabates@apple.com>
+
+        Consolidate WebKit UIKitSPI.h and UIKitTestSPI.h
+        https://bugs.webkit.org/show_bug.cgi?id=173341
+        <rdar://problem/32752890>
+
+        Reviewed by Simon Fraser.
+
+        There is little value to making a distinction between forward declarations
+        of UIKit SPI needed in the WebKit layer and just for testing. Moreover,
+        the contents of these two headers can conflict with each other following
+        r218275 as DumpRenderTree includes both headers. Instead we should remove
+        UIKitTestSPI.h and have WebKitTestRunner include the WebKit variant, UIKitSPI.h.
+
+        * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        * TestRunnerShared/spi/UIKitTestSPI.h: Removed.
+        * WebKitTestRunner/Configurations/Base.xcconfig:
+        * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj:
+        * WebKitTestRunner/cocoa/TestRunnerWKWebView.mm:
+        * WebKitTestRunner/ios/GeneratedTouchesDebugWindow.mm:
+        * WebKitTestRunner/ios/HIDEventGenerator.h:
+        * WebKitTestRunner/ios/HIDEventGenerator.mm:
+        * WebKitTestRunner/ios/PlatformWebViewIOS.mm:
+        * WebKitTestRunner/ios/TestControllerIOS.mm:
+        * WebKitTestRunner/ios/UIScriptControllerIOS.mm:
+        * WebKitTestRunner/ios/mainIOS.mm:
+
 2018-11-13  Takashi Komori  <Takashi.Komori@sony.com>
 
         Remove WebKitTestRunnerLib's build warnings.
index 210e542..a62fa65 100644 (file)
                2EDE0DAA1F5131DE00D5F8DF /* AppKitTestSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AppKitTestSPI.h; path = mac/AppKitTestSPI.h; sourceTree = "<group>"; };
                31117B3A15D9A56A00163BC8 /* MockWebNotificationProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MockWebNotificationProvider.h; path = mac/MockWebNotificationProvider.h; sourceTree = "<group>"; };
                31117B3B15D9A56A00163BC8 /* MockWebNotificationProvider.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MockWebNotificationProvider.mm; path = mac/MockWebNotificationProvider.mm; sourceTree = "<group>"; };
-               31268EBA1EF06A95001963E2 /* UIKitTestSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UIKitTestSPI.h; path = ../TestRunnerShared/spi/UIKitTestSPI.h; sourceTree = "<group>"; };
                3148A0551E6F90F400D3B316 /* IOSLayoutTestCommunication.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IOSLayoutTestCommunication.cpp; path = ../TestRunnerShared/IOSLayoutTestCommunication.cpp; sourceTree = "<group>"; };
                3148A0561E6F90F400D3B316 /* IOSLayoutTestCommunication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IOSLayoutTestCommunication.h; path = ../TestRunnerShared/IOSLayoutTestCommunication.h; sourceTree = "<group>"; };
                32A70AAB03705E1F00C91783 /* DumpRenderTreePrefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DumpRenderTreePrefix.h; sourceTree = "<group>"; };
                0F6A0DFF1D6E0F8600F1C9A8 /* ios */ = {
                        isa = PBXGroup;
                        children = (
-                               31268EBA1EF06A95001963E2 /* UIKitTestSPI.h */,
                                0F18E70C1D6BAC8C0027E547 /* UIScriptControllerIOS.mm */,
                        );
                        name = ios;
index b468a3f..5de612c 100644 (file)
 #import "DumpRenderTreeBrowserView.h"
 #import "IOSLayoutTestCommunication.h"
 #import "UIKitSPI.h"
-#import "UIKitTestSPI.h"
 #import <QuartzCore/QuartzCore.h>
 #import <WebKit/WAKWindow.h>
 #import <WebKit/WebCoreThread.h>
diff --git a/Tools/TestRunnerShared/spi/UIKitTestSPI.h b/Tools/TestRunnerShared/spi/UIKitTestSPI.h
deleted file mode 100644 (file)
index f2d7c55..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#import <wtf/Platform.h>
-
-#if PLATFORM(IOS_FAMILY)
-
-#import <UIKit/UIKit.h>
-
-#if USE(APPLE_INTERNAL_SDK)
-
-#import <UIKit/UIApplication_Private.h>
-#import <UIKit/UIKeyboard.h>
-#import <UIKit/UIView_Private.h>
-#import <UIKit/UIWindow_Private.h>
-#import <UIKit/UIDevice_Private.h>
-#import <UIKit/UIScreen_Private.h>
-#import <UIKit/_UIApplicationRotationFollowing.h>
-
-#else
-
-#import <pal/spi/cocoa/IOKitSPI.h>
-
-@interface UIApplication ()
-- (void)_enqueueHIDEvent:(IOHIDEventRef)event;
-- (void)_handleHIDEvent:(IOHIDEventRef)event;
-@end
-
-@interface UIWindow ()
-- (uint32_t)_contextId;
-@end
-
-// FIXME: https://bugs.webkit.org/show_bug.cgi?id=173341
-#ifndef _WEBKIT_UIKITSPI_UIKEYBOARD
-#define _WEBKIT_UIKITSPI_UIKEYBOARD 1
-@interface UIKeyboard : UIView
-@end
-#endif
-
-@interface UIKeyboard ()
-+ (void)removeAllDynamicDictionaries;
-+ (BOOL)isInHardwareKeyboardMode;
-@end
-
-@interface UIView ()
-- (void)_removeAllAnimations:(BOOL)includeSubviews;
-@end
-
-@interface UIDevice ()
-- (void)setOrientation:(UIDeviceOrientation)orientation animated:(BOOL)animated;
- @end
-
-@interface UIScreen ()
-- (void)_setScale:(CGFloat)scale;
-@end
-
-@interface UIApplicationRotationFollowingWindow : UIWindow
-@end
-
-@interface UIApplicationRotationFollowingController : UIViewController
-@end
-
-@interface UIApplicationRotationFollowingControllerNoTouches : UIApplicationRotationFollowingController
-@end
-#endif // USE(APPLE_INTERNAL_SDK)
-
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
-@interface UIView ()
-- (void)_updateSafeAreaInsets;
-@end
-#endif
-
-#endif // PLATFORM(IOS_FAMILY)
-
index 4049309..6733d93 100644 (file)
@@ -52,7 +52,8 @@ CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 CLANG_WARN_SUSPICIOUS_MOVE = YES;
 CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(BUILT_PRODUCTS_DIR)/WebCoreTestSupport $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(NEXT_ROOT)/usr/local/include/WebCoreTestSupport;
+HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(BUILT_PRODUCTS_DIR)/WebCoreTestSupport $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(NEXT_ROOT)/usr/local/include/WebCoreTestSupport $(PLATFORM_HEADER_SEARCH_PATHS);
+PLATFORM_HEADER_SEARCH_PATHS[sdk=iphone*] = $(SRCROOT)/../../Source/WebKit/Platform/spi/ios;
 GCC_NO_COMMON_BLOCKS = YES;
 GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) U_DISABLE_RENAMING=1 U_SHOW_CPLUSPLUS_API=0 ENABLE_DASHBOARD_SUPPORT;
 DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;
index 0f83855..eab6e28 100644 (file)
                2EE52D161890A9FB0010ED21 /* mainIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = mainIOS.mm; path = ../ios/mainIOS.mm; sourceTree = "<group>"; };
                3110BE0F15BA011400D216AC /* WebNotificationProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebNotificationProvider.h; sourceTree = "<group>"; };
                311183AA212B1AC70077BCE0 /* WebKitTestRunnerApp-watchOS.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = "WebKitTestRunnerApp-watchOS.entitlements"; sourceTree = "<group>"; };
-               31268EB91EF06A3B001963E2 /* UIKitTestSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UIKitTestSPI.h; path = ../TestRunnerShared/spi/UIKitTestSPI.h; sourceTree = "<group>"; };
                3148A0531E6F85B600D3B316 /* IOSLayoutTestCommunication.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IOSLayoutTestCommunication.cpp; path = ../TestRunnerShared/IOSLayoutTestCommunication.cpp; sourceTree = "<group>"; };
                3148A0541E6F85B600D3B316 /* IOSLayoutTestCommunication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IOSLayoutTestCommunication.h; path = ../TestRunnerShared/IOSLayoutTestCommunication.h; sourceTree = "<group>"; };
                3164C8EF15D1ADA100EF1FE0 /* WebNotificationProvider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebNotificationProvider.cpp; sourceTree = "<group>"; };
                        children = (
                                2DB6187D1D7D58D400978D19 /* CoreGraphicsTestSPI.h */,
                                2D0FF14A2192C78300C975D6 /* PencilKitTestSPI.h */,
-                               31268EB91EF06A3B001963E2 /* UIKitTestSPI.h */,
                        );
                        name = spi;
                        sourceTree = "<group>";
index 3e8351b..6c78037 100644 (file)
@@ -32,7 +32,7 @@
 #import <wtf/RetainPtr.h>
 
 #if PLATFORM(IOS_FAMILY)
-#import "UIKitTestSPI.h"
+#import "UIKitSPI.h"
 #import <WebKit/WKWebViewPrivate.h>
 @interface WKWebView ()
 
index fd43f80..7d63f33 100644 (file)
@@ -27,7 +27,7 @@
 #import "GeneratedTouchesDebugWindow.h"
 
 #import "HIDEventGenerator.h"
-#import "UIKitTestSPI.h"
+#import "UIKitSPI.h"
 #import <wtf/RetainPtr.h>
 
 static const CGFloat debugTouchDotRadius = 5;
index e8de98f..e7a9e98 100644 (file)
@@ -23,7 +23,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import "UIKitTestSPI.h"
+#import "UIKitSPI.h"
 
 #import <CoreGraphics/CGGeometry.h>
 
index 68ec856..4c842b8 100644 (file)
@@ -27,7 +27,7 @@
 #import "HIDEventGenerator.h"
 
 #import "GeneratedTouchesDebugWindow.h"
-#import "UIKitTestSPI.h"
+#import "UIKitSPI.h"
 #import <mach/mach_time.h>
 #import <pal/spi/cocoa/IOKitSPI.h>
 #import <wtf/Assertions.h>
index 4809196..317320b 100644 (file)
@@ -28,7 +28,7 @@
 
 #import "TestController.h"
 #import "TestRunnerWKWebView.h"
-#import "UIKitTestSPI.h"
+#import "UIKitSPI.h"
 #import <WebKit/WKImageCG.h>
 #import <WebKit/WKPreferencesPrivate.h>
 #import <WebKit/WKSnapshotConfiguration.h>
index c0be9a5..0b437ae 100644 (file)
@@ -32,7 +32,7 @@
 #import "PlatformWebView.h"
 #import "TestInvocation.h"
 #import "TestRunnerWKWebView.h"
-#import "UIKitTestSPI.h"
+#import "UIKitSPI.h"
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 #import <WebKit/WKPreferencesPrivate.h>
index 86b8602..da8e73a 100644 (file)
@@ -34,7 +34,7 @@
 #import "StringFunctions.h"
 #import "TestController.h"
 #import "TestRunnerWKWebView.h"
-#import "UIKitTestSPI.h"
+#import "UIKitSPI.h"
 #import "UIScriptContext.h"
 #import <JavaScriptCore/JavaScriptCore.h>
 #import <JavaScriptCore/OpaqueJSString.h>
index ddf0f99..9a5a012 100644 (file)
@@ -27,8 +27,7 @@
 
 #import "HIDEventGenerator.h"
 #import "TestController.h"
-#import "UIKitTestSPI.h"
-#import <UIKit/UIKit.h>
+#import "UIKitSPI.h"
 
 static int _argc;
 static const char **_argv;