Diff
Modified: trunk/LayoutTests/ChangeLog (243522 => 243523)
--- trunk/LayoutTests/ChangeLog 2019-03-26 22:59:28 UTC (rev 243522)
+++ trunk/LayoutTests/ChangeLog 2019-03-26 23:24:35 UTC (rev 243523)
@@ -1,3 +1,15 @@
+2019-03-26 Chris Dumez <cdu...@apple.com>
+
+ Add basic layout test coverage for File Picker on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=196265
+
+ Reviewed by Wenson Hsieh.
+
+ Add new layout test.
+
+ * fast/forms/ios/file-upload-panel-expected.txt: Added.
+ * fast/forms/ios/file-upload-panel.html: Added.
+
2019-03-26 Shawn Roberts <srobe...@apple.com>
Layout tests editing/deleting/delete-emoji-1.html
Added: trunk/LayoutTests/fast/forms/ios/file-upload-panel-expected.txt (0 => 243523)
--- trunk/LayoutTests/fast/forms/ios/file-upload-panel-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/forms/ios/file-upload-panel-expected.txt 2019-03-26 23:24:35 UTC (rev 243523)
@@ -0,0 +1,39 @@
+Basic testing for the File Upload Panel on iOS.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+* accept =
+PASS areArraysEqual(items, ["Photo Library", "Take Photo or Video", "Browse"]) is true
+
+* accept = image/*
+PASS areArraysEqual(items, ["Photo Library", "Take Photo", "Browse"]) is true
+
+* accept = video/*
+PASS areArraysEqual(items, ["Photo Library", "Take Video", "Browse"]) is true
+
+* accept = image/*, video/*
+PASS areArraysEqual(items, ["Photo Library", "Take Photo or Video", "Browse"]) is true
+
+* accept = .PNG, .GIF
+PASS areArraysEqual(items, ["Photo Library", "Take Photo", "Browse"]) is true
+
+* accept = .PNG, .GIF, .MOV
+PASS areArraysEqual(items, ["Photo Library", "Take Photo or Video", "Browse"]) is true
+
+* accept = audio/*
+PASS areArraysEqual(items, ["Browse"]) is true
+
+* accept = .TXT
+PASS areArraysEqual(items, ["Browse"]) is true
+
+* accept = .PDF
+PASS areArraysEqual(items, ["Browse"]) is true
+
+* accept = .PDF, .TXT
+PASS areArraysEqual(items, ["Browse"]) is true
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/fast/forms/ios/file-upload-panel.html (0 => 243523)
--- trunk/LayoutTests/fast/forms/ios/file-upload-panel.html (rev 0)
+++ trunk/LayoutTests/fast/forms/ios/file-upload-panel.html 2019-03-26 23:24:35 UTC (rev 243523)
@@ -0,0 +1,90 @@
+<!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true, shouldHandleRunOpenPanel=false ] -->
+<html>
+<head>
+<meta name="viewport" content="width=device-width">
+<script src=""
+<script src=""
+</head>
+<body>
+<div id="description"></div>
+<input id="testInput" type="file">
+<div id="console"></div>
+<script>
+description("Basic testing for the File Upload Panel on iOS.");
+jsTestIsAsync = true;
+
+function getFileUploadPickerMenuItemsScript()
+{
+ return `
+ (function() {
+ return JSON.stringify(uiController.contentsOfUserInterfaceItem('fileUploadPanelMenu'));
+ })();`
+}
+
+function dismissFilePickerScript()
+{
+ return `
+ (function() {
+ uiController.dismissFilePicker(function() {
+ uiController.uiScriptComplete();
+ });
+ })();`
+}
+
+function getFileUploadPickerMenuItems()
+{
+ return new Promise((resolve) => {
+ testRunner.runUIScript(getFileUploadPickerMenuItemsScript(), function(result) {
+ resolve(JSON.parse(result).fileUploadPanelMenu);
+ });
+ });
+}
+
+function dismissFilePicker()
+{
+ const uiScript = `uiController.dismissFilePicker(() => uiController.uiScriptComplete())`;
+ return new Promise(resolve => testRunner.runUIScript(uiScript, resolve));
+}
+
+function runAcceptTest(accept, expectedMenuItems)
+{
+ return new Promise((resolve) => {
+ debug("* accept = " + accept);
+ testInput.accept = accept;
+
+ UIHelper.activateElement(testInput).then(() => {
+ getFileUploadPickerMenuItems().then((_items) => {
+ items = _items;
+ shouldBeTrue("areArraysEqual(items, " + expectedMenuItems + ")");
+ debug("");
+ dismissFilePicker().then(() => { resolve(); });
+ });
+ });
+ });
+}
+
+async function runTests()
+{
+ document.getElementById("console").style = "display: none";
+
+ await runAcceptTest("", '["Photo Library", "Take Photo or Video", "Browse"]');
+ await runAcceptTest("image/*", '["Photo Library", "Take Photo", "Browse"]');
+ await runAcceptTest("video/*", '["Photo Library", "Take Video", "Browse"]');
+ await runAcceptTest("image/*, video/*", '["Photo Library", "Take Photo or Video", "Browse"]');
+ await runAcceptTest(".PNG, .GIF", '["Photo Library", "Take Photo", "Browse"]');
+ await runAcceptTest(".PNG, .GIF, .MOV", '["Photo Library", "Take Photo or Video", "Browse"]');
+ await runAcceptTest("audio/*", '["Browse"]');
+ await runAcceptTest(".TXT", '["Browse"]');
+ await runAcceptTest(".PDF", '["Browse"]');
+ await runAcceptTest(".PDF, .TXT", '["Browse"]');
+
+ document.getElementById("console").style = "";
+ finishJSTest();
+}
+
+
+_onload_ = runTests;
+
+</script>
+</body>
+</html>
Modified: trunk/Source/WebKit/ChangeLog (243522 => 243523)
--- trunk/Source/WebKit/ChangeLog 2019-03-26 22:59:28 UTC (rev 243522)
+++ trunk/Source/WebKit/ChangeLog 2019-03-26 23:24:35 UTC (rev 243523)
@@ -1,3 +1,23 @@
+2019-03-26 Chris Dumez <cdu...@apple.com>
+
+ Add basic layout test coverage for File Picker on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=196265
+
+ Reviewed by Wenson Hsieh.
+
+ Add layout test infrastructure to test the file picker on iOS.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _dismissFilePicker]):
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h:
+ * UIProcess/ios/WKContentViewInteraction.h:
+ * UIProcess/ios/WKContentViewInteraction.mm:
+ (-[WKContentView dismissFilePicker]):
+ (-[WKContentView _contentsOfUserInterfaceItem:]):
+ * UIProcess/ios/forms/WKFileUploadPanel.h:
+ * UIProcess/ios/forms/WKFileUploadPanel.mm:
+ (-[WKFileUploadPanel currentAvailableActionTitles]):
+
2019-03-26 Daniel Bates <daba...@apple.com>
[iOS][WK2] Use a better concept to describe the reason we defer zooming a focused element: selectabiltiy
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (243522 => 243523)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2019-03-26 22:59:28 UTC (rev 243522)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm 2019-03-26 23:24:35 UTC (rev 243523)
@@ -6669,6 +6669,11 @@
[_contentView accessoryDone];
}
+- (void)_dismissFilePicker
+{
+ [_contentView dismissFilePicker];
+}
+
- (void)setTimePickerValueToHour:(NSInteger)hour minute:(NSInteger)minute
{
[_contentView setTimePickerValueToHour:hour minute:minute];
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h (243522 => 243523)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h 2019-03-26 22:59:28 UTC (rev 243522)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h 2019-03-26 23:24:35 UTC (rev 243523)
@@ -451,6 +451,7 @@
- (void)keyboardAccessoryBarNext WK_API_AVAILABLE(ios(10.0));
- (void)keyboardAccessoryBarPrevious WK_API_AVAILABLE(ios(10.0));
- (void)dismissFormAccessoryView WK_API_AVAILABLE(ios(10.3));
+- (void)_dismissFilePicker WK_API_AVAILABLE(ios(WK_IOS_TBA));
- (void)selectFormAccessoryPickerRow:(int)rowIndex WK_API_AVAILABLE(ios(10.3));
@property (nonatomic, readonly) NSString *textContentTypeForTesting WK_API_AVAILABLE(ios(12.0));
@property (nonatomic, readonly) NSString *selectFormPopoverTitle WK_API_AVAILABLE(ios(12.0));
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h (243522 => 243523)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h 2019-03-26 22:59:28 UTC (rev 243522)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h 2019-03-26 23:24:35 UTC (rev 243523)
@@ -430,6 +430,7 @@
- (void)_showRunOpenPanel:(API::OpenPanelParameters*)parameters resultListener:(WebKit::WebOpenPanelResultListenerProxy*)listener;
- (void)_showShareSheet:(const WebCore::ShareDataWithParsedURL&)shareData completionHandler:(WTF::CompletionHandler<void(bool)>&&)completionHandler;
- (void)accessoryDone;
+- (void)dismissFilePicker;
- (void)_didHandleKeyEvent:(::WebEvent *)event eventWasHandled:(BOOL)eventWasHandled;
- (Vector<WebKit::OptionItem>&) focusedSelectElementOptions;
- (void)_enableInspectorNodeSearch;
Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (243522 => 243523)
--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2019-03-26 22:59:28 UTC (rev 243522)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm 2019-03-26 23:24:35 UTC (rev 243523)
@@ -4509,6 +4509,11 @@
return NO;
}
+- (void)dismissFilePicker
+{
+ [_fileUploadPanel dismiss];
+}
+
- (BOOL)isScrollableForKeyboardScrollViewAnimator:(WKKeyboardScrollViewAnimator *)animator
{
if (_page->editorState().isContentEditable)
@@ -7019,6 +7024,12 @@
return @{ userInterfaceItem: @{ @"pageURL": url } };
}
#endif
+
+ if ([userInterfaceItem isEqualToString:@"fileUploadPanelMenu"]) {
+ if (!_fileUploadPanel)
+ return @{ userInterfaceItem: @[] };
+ return @{ userInterfaceItem: [_fileUploadPanel currentAvailableActionTitles] };
+ }
return nil;
}
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.h (243522 => 243523)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.h 2019-03-26 22:59:28 UTC (rev 243522)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.h 2019-03-26 23:24:35 UTC (rev 243523)
@@ -43,6 +43,8 @@
- (instancetype)initWithView:(WKContentView *)view;
- (void)presentWithParameters:(API::OpenPanelParameters*)parameters resultListener:(WebKit::WebOpenPanelResultListenerProxy*)listener;
- (void)dismiss;
+
+- (NSArray<NSString *> *)currentAvailableActionTitles;
@end
@protocol WKFileUploadPanelDelegate <NSObject>
Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm (243522 => 243523)
--- trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm 2019-03-26 22:59:28 UTC (rev 243522)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm 2019-03-26 23:24:35 UTC (rev 243523)
@@ -312,6 +312,26 @@
}
}
+- (NSArray<NSString *> *)currentAvailableActionTitles
+{
+ NSMutableArray<NSString *> *actionTitles = [NSMutableArray array];
+
+ NSArray *mediaTypes = UTIsForMIMETypes(_mimeTypes.get()).allObjects;
+ BOOL containsImageMediaType = !mediaTypes.count || arrayContainsUTIThatConformsTo(mediaTypes, kUTTypeImage);
+ BOOL containsVideoMediaType = !mediaTypes.count || arrayContainsUTIThatConformsTo(mediaTypes, kUTTypeMovie);
+ if (containsImageMediaType || containsVideoMediaType) {
+ [actionTitles addObject:@"Photo Library"];
+ if (containsImageMediaType && containsVideoMediaType)
+ [actionTitles addObject:@"Take Photo or Video"];
+ else if (containsVideoMediaType)
+ [actionTitles addObject:@"Take Video"];
+ else
+ [actionTitles addObject:@"Take Photo"];
+ }
+ [actionTitles addObject:@"Browse"];
+ return actionTitles;
+}
+
#pragma mark - Media Types
static NSSet<NSString *> *UTIsForMIMETypes(NSArray *mimeTypes)
Modified: trunk/Tools/ChangeLog (243522 => 243523)
--- trunk/Tools/ChangeLog 2019-03-26 22:59:28 UTC (rev 243522)
+++ trunk/Tools/ChangeLog 2019-03-26 23:24:35 UTC (rev 243523)
@@ -1,3 +1,29 @@
+2019-03-26 Chris Dumez <cdu...@apple.com>
+
+ Add basic layout test coverage for File Picker on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=196265
+
+ Reviewed by Wenson Hsieh.
+
+ Add layout test infrastructure to test the file picker on iOS.
+
+ * DumpRenderTree/ios/UIScriptControllerIOS.mm:
+ (WTR::UIScriptController::dismissFilePicker):
+ * TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl:
+ * TestRunnerShared/UIScriptContext/UIScriptController.cpp:
+ (WTR::UIScriptController::dismissFilePicker):
+ * TestRunnerShared/UIScriptContext/UIScriptController.h:
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::createWebViewWithOptions):
+ (WTR::updateTestOptionsFromTestHeader):
+ * WebKitTestRunner/TestOptions.h:
+ (WTR::TestOptions::hasSameInitializationOptions const):
+ * WebKitTestRunner/ios/TestControllerIOS.mm:
+ (overridePresentViewController):
+ (WTR::TestController::platformInitialize):
+ * WebKitTestRunner/ios/UIScriptControllerIOS.mm:
+ (WTR::UIScriptController::dismissFilePicker):
+
2019-03-26 Wenson Hsieh <wenson_hs...@apple.com>
Implement async paste method on UIWKInteractionViewProtocol
Modified: trunk/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm (243522 => 243523)
--- trunk/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm 2019-03-26 22:59:28 UTC (rev 243522)
+++ trunk/Tools/DumpRenderTree/ios/UIScriptControllerIOS.mm 2019-03-26 23:24:35 UTC (rev 243523)
@@ -175,6 +175,10 @@
{
}
+void UIScriptController::dismissFilePicker(JSValueRef)
+{
+}
+
void UIScriptController::setTimePickerValue(long, long)
{
}
Modified: trunk/Tools/TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl (243522 => 243523)
--- trunk/Tools/TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl 2019-03-26 22:59:28 UTC (rev 243522)
+++ trunk/Tools/TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl 2019-03-26 23:24:35 UTC (rev 243523)
@@ -187,6 +187,8 @@
// Equivalent of pressing the Done button in the form accessory bar.
void dismissFormAccessoryView();
+ void dismissFilePicker(object callback);
+
readonly attribute DOMString textContentType;
// Form control handling
Modified: trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp (243522 => 243523)
--- trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp 2019-03-26 22:59:28 UTC (rev 243522)
+++ trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptController.cpp 2019-03-26 23:24:35 UTC (rev 243523)
@@ -347,6 +347,10 @@
{
}
+void UIScriptController::dismissFilePicker(JSValueRef)
+{
+}
+
void UIScriptController::setTimePickerValue(long, long)
{
}
Modified: trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h (243522 => 243523)
--- trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h 2019-03-26 22:59:28 UTC (rev 243522)
+++ trunk/Tools/TestRunnerShared/UIScriptContext/UIScriptController.h 2019-03-26 23:24:35 UTC (rev 243523)
@@ -106,6 +106,7 @@
void applyAutocorrection(JSStringRef newString, JSStringRef oldString, JSValueRef callback);
+ void dismissFilePicker(JSValueRef callback);
void dismissFormAccessoryView();
void selectFormAccessoryPickerRow(long);
JSRetainPtr<JSStringRef> textContentType() const;
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (243522 => 243523)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2019-03-26 22:59:28 UTC (rev 243522)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2019-03-26 23:24:35 UTC (rev 243523)
@@ -607,7 +607,7 @@
0, // didDraw
0, // pageDidScroll
0, // exceededDatabaseQuota,
- runOpenPanel,
+ options.shouldHandleRunOpenPanel ? runOpenPanel : 0,
decidePolicyForGeolocationPermissionRequest,
0, // headerHeight
0, // footerHeight
@@ -1316,6 +1316,8 @@
testOptions.editable = parseBooleanTestHeaderValue(value);
else if (key == "enableUndoManagerAPI")
testOptions.enableUndoManagerAPI = parseBooleanTestHeaderValue(value);
+ else if (key == "shouldHandleRunOpenPanel")
+ testOptions.shouldHandleRunOpenPanel = parseBooleanTestHeaderValue(value);
else if (key == "contentInset.top")
testOptions.contentInsetTop = std::stod(value);
else if (key == "ignoreSynchronousMessagingTimeouts")
Modified: trunk/Tools/WebKitTestRunner/TestOptions.h (243522 => 243523)
--- trunk/Tools/WebKitTestRunner/TestOptions.h 2019-03-26 22:59:28 UTC (rev 243522)
+++ trunk/Tools/WebKitTestRunner/TestOptions.h 2019-03-26 23:24:35 UTC (rev 243523)
@@ -89,6 +89,7 @@
bool enableEditableImages { false };
bool editable { false };
bool enableUndoManagerAPI { false };
+ bool shouldHandleRunOpenPanel { true };
double contentInsetTop { 0 };
@@ -136,6 +137,7 @@
|| enableEditableImages != options.enableEditableImages
|| editable != options.editable
|| enableUndoManagerAPI != options.enableUndoManagerAPI
+ || shouldHandleRunOpenPanel != options.shouldHandleRunOpenPanel
|| contentInsetTop != options.contentInsetTop)
return false;
Modified: trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm (243522 => 243523)
--- trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm 2019-03-26 22:59:28 UTC (rev 243522)
+++ trunk/Tools/WebKitTestRunner/ios/TestControllerIOS.mm 2019-03-26 23:24:35 UTC (rev 243523)
@@ -50,6 +50,10 @@
return NO;
}
+static void overridePresentViewControllerOrPopover()
+{
+}
+
namespace WTR {
static bool isDoneWaitingForKeyboardToDismiss = true;
@@ -96,6 +100,9 @@
// Override the implementation of +[UIKeyboard isInHardwareKeyboardMode] to ensure that test runs are deterministic
// regardless of whether a hardware keyboard is attached. We intentionally never restore the original implementation.
method_setImplementation(class_getClassMethod([UIKeyboard class], @selector(isInHardwareKeyboardMode)), reinterpret_cast<IMP>(overrideIsInHardwareKeyboardMode));
+
+ method_setImplementation(class_getInstanceMethod([UIViewController class], @selector(presentViewController:animated:completion:)), reinterpret_cast<IMP>(overridePresentViewControllerOrPopover));
+ method_setImplementation(class_getInstanceMethod([UIPopoverController class], @selector(presentPopoverFromRect:inView:permittedArrowDirections:animated:)), reinterpret_cast<IMP>(overridePresentViewControllerOrPopover));
}
void TestController::platformDestroy()
Modified: trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm (243522 => 243523)
--- trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm 2019-03-26 22:59:28 UTC (rev 243522)
+++ trunk/Tools/WebKitTestRunner/ios/UIScriptControllerIOS.mm 2019-03-26 23:24:35 UTC (rev 243523)
@@ -482,6 +482,19 @@
[webView dismissFormAccessoryView];
}
+void UIScriptController::dismissFilePicker(JSValueRef callback)
+{
+ TestRunnerWKWebView *webView = TestController::singleton().mainWebView()->platformView();
+ [webView _dismissFilePicker];
+
+ // Round-trip with the WebProcess to make sure it has been notified of the dismissal.
+ unsigned callbackID = m_context->prepareForAsyncTask(callback, CallbackTypeNonPersistent);
+ [webView evaluateJavaScript:@"" completionHandler:^(id result, NSError *error) {
+ if (m_context)
+ m_context->asyncTaskComplete(callbackID);
+ }];
+}
+
JSRetainPtr<JSStringRef> UIScriptController::selectFormPopoverTitle() const
{
TestRunnerWKWebView *webView = TestController::singleton().mainWebView()->platformView();
