Modified: branches/safari-609-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm (259893 => 259894)
--- branches/safari-609-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm 2020-04-10 20:07:08 UTC (rev 259893)
+++ branches/safari-609-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm 2020-04-10 20:22:15 UTC (rev 259894)
@@ -6398,6 +6398,7 @@
#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
+#if __IPHONE_OS_VERSION_MIN_REQUIRED > 130400
TEST(ProcessSwap, QuickLookRequestsPasswordAfterSwap)
{
auto processPoolConfiguration = psonProcessPoolConfiguration();
@@ -6431,6 +6432,7 @@
TestWebKitAPI::Util::run(&didFinishQuickLookLoad);
didFinishQuickLookLoad = false;
}
+#endif
static const char* minimumWidthPageBytes = R"PSONRESOURCE(
<!DOCTYPE html>
Modified: branches/safari-609-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/QuickLook.mm (259893 => 259894)
--- branches/safari-609-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/QuickLook.mm 2020-04-10 20:07:08 UTC (rev 259893)
+++ branches/safari-609-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/QuickLook.mm 2020-04-10 20:22:15 UTC (rev 259894)
@@ -272,6 +272,7 @@
return runTest(delegate, request, YES);
}
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED > 130400
static RetainPtr<WKWebView> runTestDecideAfterLoading(QuickLookDelegate *delegate, NSURLRequest *request)
{
return runTest(delegate, request, NO);
@@ -296,6 +297,7 @@
EXPECT_TRUE([delegate didFinishQuickLookLoad]);
EXPECT_TRUE([delegate didStartQuickLookLoad]);
}
+#endif
@interface QuickLookAsyncDelegate : QuickLookDelegate
@end
@@ -314,6 +316,7 @@
@end
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED > 130400
TEST(QuickLook, AsyncAllowResponseBeforeLoadingPreview)
{
auto delegate = adoptNS([[QuickLookAsyncDelegate alloc] initWithExpectedFileURL:pagesDocumentURL responsePolicy:WKNavigationResponsePolicyAllow]);
@@ -333,6 +336,7 @@
EXPECT_TRUE([delegate didFinishQuickLookLoad]);
EXPECT_TRUE([delegate didStartQuickLookLoad]);
}
+#endif
TEST(QuickLook, CancelResponseBeforeLoadingPreview)
{
@@ -345,6 +349,7 @@
EXPECT_TRUE([delegate didFailNavigation]);
}
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED > 130400
TEST(QuickLook, CancelResponseAfterLoadingPreview)
{
auto delegate = adoptNS([[QuickLookDelegate alloc] initWithExpectedFileURL:pagesDocumentURL previewMIMEType:pagesDocumentPreviewMIMEType responsePolicy:WKNavigationResponsePolicyCancel]);
@@ -355,6 +360,7 @@
EXPECT_TRUE([delegate didFinishQuickLookLoad]);
EXPECT_TRUE([delegate didStartQuickLookLoad]);
}
+#endif
TEST(QuickLook, DownloadResponseBeforeLoadingPreview)
{
@@ -370,6 +376,7 @@
[delegate verifyDownload];
}
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED > 130400
TEST(QuickLook, DownloadResponseAfterLoadingPreview)
{
auto delegate = adoptNS([[QuickLookDelegate alloc] initWithExpectedFileURL:pagesDocumentURL previewMIMEType:pagesDocumentPreviewMIMEType responsePolicy:_WKNavigationResponsePolicyBecomeDownload]);
@@ -380,6 +387,7 @@
EXPECT_TRUE([delegate didFinishQuickLookLoad]);
EXPECT_TRUE([delegate didStartQuickLookLoad]);
}
+#endif
@interface QuickLookPasswordDelegate : QuickLookDelegate
@property (nonatomic) BOOL didRequestPassword;
@@ -395,6 +403,7 @@
@end
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED > 130400
TEST(QuickLook, RequestPasswordBeforeLoadingPreview)
{
NSURL *passwordProtectedDocumentURL = [NSBundle.mainBundle URLForResource:@"password-protected" withExtension:@"pages" subdirectory:@"TestWebKitAPI.resources"];
@@ -444,6 +453,7 @@
}];
Util::run(&isDone);
}
+#endif
@interface QuickLookLegacyDelegate : NSObject <WebFrameLoadDelegate, WebPolicyDelegate>
@end
@@ -463,6 +473,7 @@
@end
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED > 130400
TEST(QuickLook, LegacyQuickLookContent)
{
WebKitInitialize();
@@ -535,5 +546,6 @@
TestProtocol.additionalResponseHeaders = nil;
[TestProtocol unregister];
}
+#endif
#endif // PLATFORM(IOS_FAMILY)
