Diff
Modified: trunk/Source/WebKit2/ChangeLog (218274 => 218275)
--- trunk/Source/WebKit2/ChangeLog 2017-06-14 18:14:51 UTC (rev 218274)
+++ trunk/Source/WebKit2/ChangeLog 2017-06-14 18:15:50 UTC (rev 218275)
@@ -1,3 +1,13 @@
+2017-06-14 Jonathan Bedard <[email protected]>
+
+ Configure screen scale for running layout tests on plus devices
+ https://bugs.webkit.org/show_bug.cgi?id=173319
+
+ Reviewed by Tim Horton.
+
+ * Platform/spi/ios/UIKitSPI.h: Both this and UIKitTestSPI.h define UIKeyboard. Use
+ a define guard to prevent re-definition.
+
2017-06-14 Carlos Garcia Campos <[email protected]>
[GTK] Use API::InjectedBundle::ResourceLoadClient in WebKitWebPage
Modified: trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h (218274 => 218275)
--- trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2017-06-14 18:14:51 UTC (rev 218274)
+++ trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2017-06-14 18:15:50 UTC (rev 218275)
@@ -212,8 +212,12 @@
- (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;
Modified: trunk/Tools/ChangeLog (218274 => 218275)
--- trunk/Tools/ChangeLog 2017-06-14 18:14:51 UTC (rev 218274)
+++ trunk/Tools/ChangeLog 2017-06-14 18:15:50 UTC (rev 218275)
@@ -1,3 +1,26 @@
+2017-06-14 Jonathan Bedard <[email protected]>
+
+ Configure screen scale for running layout tests on plus devices
+ https://bugs.webkit.org/show_bug.cgi?id=173319
+
+ Reviewed by Tim Horton.
+
+ * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj: Include UIKitTestSPI.h in project.
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (dumpRenderTree): Set screen scale to 2.0.
+ * TestRunnerShared/spi/UIKitTestSPI.h: Copied from Tools/WebKitTestRunner/ios/UIKitSPI.h,
+ add _setScale for UIScreen.
+ * WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj: Include UIKitTestSPI.h in project.
+ * WebKitTestRunner/cocoa/TestRunnerWKWebView.mm: Import UIKitTestSPI.h instead of UIKitSPI.h.
+ * WebKitTestRunner/ios/HIDEventGenerator.h: Ditto.
+ * WebKitTestRunner/ios/HIDEventGenerator.mm: Ditto.
+ * WebKitTestRunner/ios/PlatformWebViewIOS.mm: Ditto.
+ * WebKitTestRunner/ios/TestControllerIOS.mm: Ditto.
+ (WTR::TestController::platformInitialize): Set screen scale to 2.0.
+ * WebKitTestRunner/ios/UIKitSPI.h: Moved to TestRunnerShared/spi/UIKitTestSPI.h.
+ * WebKitTestRunner/ios/UIScriptControllerIOS.mm: Import UIKitTestSPI.h instead of UIKitSPI.h.
+ * WebKitTestRunner/ios/mainIOS.mm: Ditto.
+
2017-06-14 Alexey Proskuryakov <[email protected]>
Add iOS 11 support to the bot watcher's dashboard
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj (218274 => 218275)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2017-06-14 18:14:51 UTC (rev 218274)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2017-06-14 18:15:50 UTC (rev 218275)
@@ -286,6 +286,7 @@
2DA2E3A41E1BA54100A3BBD0 /* DumpRenderTreeSpellChecker.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = DumpRenderTreeSpellChecker.mm; path = mac/DumpRenderTreeSpellChecker.mm; 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>"; };
@@ -535,6 +536,7 @@
0F6A0DFF1D6E0F8600F1C9A8 /* ios */ = {
isa = PBXGroup;
children = (
+ 31268EBA1EF06A95001963E2 /* UIKitTestSPI.h */,
0F18E70C1D6BAC8C0027E547 /* UIScriptControllerIOS.mm */,
);
name = ios;
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (218274 => 218275)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2017-06-14 18:14:51 UTC (rev 218274)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2017-06-14 18:15:50 UTC (rev 218275)
@@ -105,6 +105,7 @@
#import "DumpRenderTreeBrowserView.h"
#import "IOSLayoutTestCommunication.h"
#import "UIKitSPI.h"
+#import "UIKitTestSPI.h"
#import <QuartzCore/QuartzCore.h>
#import <WebCore/CoreGraphicsSPI.h>
#import <WebKit/WAKWindow.h>
@@ -1242,6 +1243,7 @@
#if PLATFORM(IOS)
setUpIOSLayoutTestCommunication();
[UIApplication sharedApplication].idleTimerDisabled = YES;
+ [[UIScreen mainScreen] _setScale:2.0];
#endif
signal(SIGILL, &writeCrashedMessageOnFatalError);
Copied: trunk/Tools/TestRunnerShared/spi/UIKitTestSPI.h (from rev 218274, trunk/Tools/WebKitTestRunner/ios/UIKitSPI.h) (0 => 218275)
--- trunk/Tools/TestRunnerShared/spi/UIKitTestSPI.h (rev 0)
+++ trunk/Tools/TestRunnerShared/spi/UIKitTestSPI.h 2017-06-14 18:15:50 UTC (rev 218275)
@@ -0,0 +1,93 @@
+/*
+ * 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)
+
+#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>
+
+@interface UIKeyboardPredictionView : UIView
++ (UIKeyboardPredictionView *)activeInstance;
+- (BOOL)hasPredictions;
+@end
+
+#else
+
+#import "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;
+@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
+
+#endif // USE(APPLE_INTERNAL_SDK)
+
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
+@interface UIView ()
+- (void)_updateSafeAreaInsets;
+@end
+#endif
+
+#endif // PLATFORM(IOS)
+
Modified: trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj (218274 => 218275)
--- trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj 2017-06-14 18:14:51 UTC (rev 218274)
+++ trunk/Tools/WebKitTestRunner/WebKitTestRunner.xcodeproj/project.pbxproj 2017-06-14 18:15:50 UTC (rev 218275)
@@ -214,7 +214,6 @@
0FEBF8581BB61DF20028722D /* HIDEventGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HIDEventGenerator.h; sourceTree = "<group>"; };
0FEBF8591BB61DF20028722D /* HIDEventGenerator.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = HIDEventGenerator.mm; sourceTree = "<group>"; };
0FEBF85B1BB62A370028722D /* IOKitSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = IOKitSPI.h; path = ../TestRunnerShared/spi/IOKitSPI.h; sourceTree = "<group>"; };
- 0FEBF85C1BB62D460028722D /* UIKitSPI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UIKitSPI.h; sourceTree = "<group>"; };
1A3326051B75396500F89F62 /* TestOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TestOptions.h; sourceTree = "<group>"; };
1CA211C71BCA107300B2101F /* FontWithFeatures.otf */ = {isa = PBXFileReference; lastKnownFileType = file; path = FontWithFeatures.otf; sourceTree = "<group>"; };
1CA211C81BCA107300B2101F /* FontWithFeatures.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = FontWithFeatures.ttf; sourceTree = "<group>"; };
@@ -263,6 +262,7 @@
2EE52D141890A9FB0010ED21 /* TestControllerIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = TestControllerIOS.mm; sourceTree = "<group>"; };
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>"; };
+ 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>"; };
@@ -567,6 +567,7 @@
2DB6187F1D7D598800978D19 /* spi */ = {
isa = PBXGroup;
children = (
+ 31268EB91EF06A3B001963E2 /* UIKitTestSPI.h */,
2DB6187D1D7D58D400978D19 /* CoreGraphicsTestSPI.h */,
0FEBF85B1BB62A370028722D /* IOKitSPI.h */,
);
@@ -632,7 +633,6 @@
0FEBF8591BB61DF20028722D /* HIDEventGenerator.mm */,
2EE52D131890A9FB0010ED21 /* PlatformWebViewIOS.mm */,
2EE52D141890A9FB0010ED21 /* TestControllerIOS.mm */,
- 0FEBF85C1BB62D460028722D /* UIKitSPI.h */,
0F73B55B1BA89042004B3EF4 /* UIScriptControllerIOS.mm */,
);
path = ios;
Modified: trunk/Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.mm (218274 => 218275)
--- trunk/Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.mm 2017-06-14 18:14:51 UTC (rev 218274)
+++ trunk/Tools/WebKitTestRunner/cocoa/TestRunnerWKWebView.mm 2017-06-14 18:15:50 UTC (rev 218275)
@@ -31,7 +31,7 @@
#import <wtf/RetainPtr.h>
#if PLATFORM(IOS)
-#import "UIKitSPI.h"
+#import "UIKitTestSPI.h"
#import <WebKit/WKWebViewPrivate.h>
@interface WKWebView ()
Modified: trunk/Tools/WebKitTestRunner/ios/HIDEventGenerator.h (218274 => 218275)
--- trunk/Tools/WebKitTestRunner/ios/HIDEventGenerator.h 2017-06-14 18:14:51 UTC (rev 218274)
+++ trunk/Tools/WebKitTestRunner/ios/HIDEventGenerator.h 2017-06-14 18:15:50 UTC (rev 218275)
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#import "UIKitSPI.h"
+#import "UIKitTestSPI.h"
#import <CoreGraphics/CGGeometry.h>
Modified: trunk/Tools/WebKitTestRunner/ios/HIDEventGenerator.mm (218274 => 218275)
--- trunk/Tools/WebKitTestRunner/ios/HIDEventGenerator.mm 2017-06-14 18:14:51 UTC (rev 218274)
+++ trunk/Tools/WebKitTestRunner/ios/HIDEventGenerator.mm 2017-06-14 18:15:50 UTC (rev 218275)
@@ -27,7 +27,7 @@
#import "HIDEventGenerator.h"
#import "IOKitSPI.h"
-#import "UIKitSPI.h"
+#import "UIKitTestSPI.h"
#import <WebCore/SoftLinking.h>
#import <mach/mach_time.h>
#import <wtf/Assertions.h>
Modified: trunk/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm (218274 => 218275)
--- trunk/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm 2017-06-14 18:14:51 UTC (rev 218274)
+++ trunk/Tools/WebKitTestRunner/ios/PlatformWebViewIOS.mm 2017-06-14 18:15:50 UTC (rev 218275)
@@ -28,7 +28,7 @@
#import "TestController.h"
#import "TestRunnerWKWebView.h"
-#import "UIKitSPI.h"
+#import "UIKitTestSPI.h"
#import <WebCore/QuartzCoreSPI.h>
#import <WebKit/WKImageCG.h>
#import <WebKit/WKPreferencesPrivate.h>
Modified: trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm (218274 => 218275)
--- trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm 2017-06-14 18:14:51 UTC (rev 218274)
+++ trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm 2017-06-14 18:15:50 UTC (rev 218275)
@@ -31,7 +31,7 @@
#import "PlatformWebView.h"
#import "TestInvocation.h"
#import "TestRunnerWKWebView.h"
-#import "UIKitSPI.h"
+#import "UIKitTestSPI.h"
#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
#import <WebKit/WKPreferencesRefPrivate.h>
@@ -52,6 +52,7 @@
{
setUpIOSLayoutTestCommunication();
[UIApplication sharedApplication].idleTimerDisabled = YES;
+ [[UIScreen mainScreen] _setScale:2.0];
}
void TestController::platformDestroy()
Deleted: trunk/Tools/WebKitTestRunner/ios/UIKitSPI.h (218274 => 218275)
--- trunk/Tools/WebKitTestRunner/ios/UIKitSPI.h 2017-06-14 18:14:51 UTC (rev 218274)
+++ trunk/Tools/WebKitTestRunner/ios/UIKitSPI.h 2017-06-14 18:15:50 UTC (rev 218275)
@@ -1,81 +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)
-
-#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>
-
-@interface UIKeyboardPredictionView : UIView
-+ (UIKeyboardPredictionView *)activeInstance;
-- (BOOL)hasPredictions;
-@end
-
-#else
-
-#import "IOKitSPI.h"
-
-@interface UIApplication ()
-- (void)_enqueueHIDEvent:(IOHIDEventRef)event;
-- (void)_handleHIDEvent:(IOHIDEventRef)event;
-@end
-
-@interface UIWindow ()
-- (uint32_t)_contextId;
-@end
-
-@interface UIKeyboard : UIView
-+ (void)removeAllDynamicDictionaries;
-@end
-
-@interface UIView ()
-- (void)_removeAllAnimations:(BOOL)includeSubviews;
-@end
-
-@interface UIDevice ()
-- (void)setOrientation:(UIDeviceOrientation)orientation animated:(BOOL)animated;
- @end
-
-#endif // USE(APPLE_INTERNAL_SDK)
-
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
-@interface UIView ()
-- (void)_updateSafeAreaInsets;
-@end
-#endif
-
-#endif // PLATFORM(IOS)
-
Modified: trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm (218274 => 218275)
--- trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm 2017-06-14 18:14:51 UTC (rev 218274)
+++ trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm 2017-06-14 18:15:50 UTC (rev 218275)
@@ -33,7 +33,7 @@
#import "StringFunctions.h"
#import "TestController.h"
#import "TestRunnerWKWebView.h"
-#import "UIKitSPI.h"
+#import "UIKitTestSPI.h"
#import "UIScriptContext.h"
#import <_javascript_Core/_javascript_Core.h>
#import <_javascript_Core/OpaqueJSString.h>
Modified: trunk/Tools/WebKitTestRunner/ios/mainIOS.mm (218274 => 218275)
--- trunk/Tools/WebKitTestRunner/ios/mainIOS.mm 2017-06-14 18:14:51 UTC (rev 218274)
+++ trunk/Tools/WebKitTestRunner/ios/mainIOS.mm 2017-06-14 18:15:50 UTC (rev 218275)
@@ -27,7 +27,7 @@
#import "HIDEventGenerator.h"
#import "TestController.h"
-#import "UIKitSPI.h"
+#import "UIKitTestSPI.h"
#import <UIKit/UIKit.h>
static int _argc;
