Title: [236755] trunk/Tools
- Revision
- 236755
- Author
- realda...@apple.com
- Date
- 2018-10-02 11:39:08 -0700 (Tue, 02 Oct 2018)
Log Message
Unreviewed, rolling out r236751.
broke the iOS Build
Reverted changeset:
"Fix iOS TestWebKitAPI failures following
<https://trac.webkit.org/changeset/236619>"
https://bugs.webkit.org/show_bug.cgi?id=190017
https://trac.webkit.org/changeset/236751
Patch by Dawei Fenton <realda...@apple.com> on 2018-10-02
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (236754 => 236755)
--- trunk/Tools/ChangeLog 2018-10-02 18:36:32 UTC (rev 236754)
+++ trunk/Tools/ChangeLog 2018-10-02 18:39:08 UTC (rev 236755)
@@ -1,3 +1,16 @@
+2018-10-02 Dawei Fenton <realda...@apple.com>
+
+ Unreviewed, rolling out r236751.
+
+ broke the iOS Build
+
+ Reverted changeset:
+
+ "Fix iOS TestWebKitAPI failures following
+ <https://trac.webkit.org/changeset/236619>"
+ https://bugs.webkit.org/show_bug.cgi?id=190017
+ https://trac.webkit.org/changeset/236751
+
2018-10-02 Daniel Bates <daba...@apple.com>
Fix iOS TestWebKitAPI failures following <https://trac.webkit.org/changeset/236619>
Modified: trunk/Tools/TestWebKitAPI/Tests/ios/DragAndDropTestsIOS.mm (236754 => 236755)
--- trunk/Tools/TestWebKitAPI/Tests/ios/DragAndDropTestsIOS.mm 2018-10-02 18:36:32 UTC (rev 236754)
+++ trunk/Tools/TestWebKitAPI/Tests/ios/DragAndDropTestsIOS.mm 2018-10-02 18:39:08 UTC (rev 236755)
@@ -27,7 +27,6 @@
#if ENABLE(DRAG_SUPPORT) && PLATFORM(IOS) && WK_API_ENABLED
-#import "ClassMethodSwizzler.h"
#import "DragAndDropSimulator.h"
#import "PlatformUtilities.h"
#import "TestWKWebView.h"
@@ -908,15 +907,8 @@
EXPECT_TRUE([webView editorContainsImageElement]);
}
-static BOOL overrideIsInHardwareKeyboardMode()
-{
- return NO;
-}
-
TEST(DragAndDropTests, ExternalSourceUTF8PlainTextOnly)
{
- ClassMethodSwizzler swizzler([UIKeyboard class], @selector(isInHardwareKeyboardMode), reinterpret_cast<IMP>(overrideIsInHardwareKeyboardMode));
-
auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500)]);
[webView synchronouslyLoadTestPageNamed:@"autofocus-contenteditable"];
@@ -936,8 +928,6 @@
TEST(DragAndDropTests, ExternalSourceJPEGOnly)
{
- ClassMethodSwizzler swizzler([UIKeyboard class], @selector(isInHardwareKeyboardMode), reinterpret_cast<IMP>(overrideIsInHardwareKeyboardMode));
-
auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500)]);
[webView synchronouslyLoadTestPageNamed:@"autofocus-contenteditable"];
Modified: trunk/Tools/TestWebKitAPI/Tests/ios/WKWebViewAutofillTests.mm (236754 => 236755)
--- trunk/Tools/TestWebKitAPI/Tests/ios/WKWebViewAutofillTests.mm 2018-10-02 18:36:32 UTC (rev 236754)
+++ trunk/Tools/TestWebKitAPI/Tests/ios/WKWebViewAutofillTests.mm 2018-10-02 18:39:08 UTC (rev 236755)
@@ -27,7 +27,6 @@
#if WK_API_ENABLED && PLATFORM(IOS)
-#import "ClassMethodSwizzler.h"
#import "PlatformUtilities.h"
#import "TestInputDelegate.h"
#import "TestWKWebView.h"
@@ -165,15 +164,8 @@
EXPECT_FALSE([webView textInputHasAutofillContext]);
}
-static BOOL overrideIsInHardwareKeyboardMode()
-{
- return NO;
-}
-
TEST(WKWebViewAutofillTests, AutofillRequiresInputSession)
{
- ClassMethodSwizzler swizzler([UIKeyboard class], @selector(isInHardwareKeyboardMode), reinterpret_cast<IMP>(overrideIsInHardwareKeyboardMode));
-
auto webView = adoptNS([[AutofillTestView alloc] initWithFrame:CGRectMake(0, 0, 320, 500)]);
[(TestInputDelegate *)[webView _inputDelegate] setFocusStartsInputSessionPolicyHandler:[] (WKWebView *, id <_WKFocusedElementInfo>) -> _WKFocusStartsInputSessionPolicy {
return _WKFocusStartsInputSessionPolicyAuto;
Modified: trunk/Tools/TestWebKitAPI/ios/UIKitSPI.h (236754 => 236755)
--- trunk/Tools/TestWebKitAPI/ios/UIKitSPI.h 2018-10-02 18:36:32 UTC (rev 236754)
+++ trunk/Tools/TestWebKitAPI/ios/UIKitSPI.h 2018-10-02 18:39:08 UTC (rev 236755)
@@ -30,7 +30,6 @@
#if USE(APPLE_INTERNAL_SDK)
#import <UIKit/UIApplication_Private.h>
-#import <UIKit/UIKeyboard_Private.h>
#import <UIKit/UIResponder_Private.h>
#import <UIKit/UITextInputMultiDocument.h>
#import <UIKit/UITextInputTraits_Private.h>
@@ -161,8 +160,4 @@
- (UIResponder *)firstResponder;
@end
-@interface UIKeyboard ()
-+ (BOOL)isInHardwareKeyboardMode;
-@end
-
#endif // PLATFORM(IOS)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
