Changeset 244371 in webkit
- Timestamp:
- Apr 16, 2019 9:45:49 PM (5 years ago)
- Location:
- trunk/Source/WebKit
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r244370 r244371 1 2019-04-16 Andy Estes <aestes@apple.com> 2 3 [iOSMac] Use UIDocumentPickerViewController for picking files 4 https://bugs.webkit.org/show_bug.cgi?id=196999 5 <rdar://problem/49961414> 6 7 Reviewed by Tim Horton. 8 9 * UIProcess/ios/forms/WKFileUploadPanel.mm: 10 (-[WKFileUploadPanel _showDocumentPickerMenu]): 11 Changed to present a UIDocumentPickerViewController on iOSMac. 12 13 (-[WKFileUploadPanel documentPicker:didPickDocumentsAtURLs:]): 14 (-[WKFileUploadPanel documentPicker:didPickDocumentAtURL:]): 15 Replaced a deprecated delegate method implementation. 16 1 17 2019-04-16 Wenson Hsieh <wenson_hsieh@apple.com> 2 18 -
trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm
r243523 r244371 405 405 BOOL containsVideoMediaType = !mediaTypes.count || arrayContainsUTIThatConformsTo(mediaTypes, kUTTypeMovie); 406 406 407 #if PLATFORM(IOSMAC) 408 // FIXME 49961589: Support picking media with UIImagePickerController 409 BOOL shouldPresentDocumentMenuViewController = NO; 410 #else 411 BOOL shouldPresentDocumentMenuViewController = containsImageMediaType || containsVideoMediaType; 412 #endif 413 407 414 NSArray *documentTypes = mediaTypes.count ? mediaTypes : @[(__bridge NSString *)kUTTypeItem]; 408 if ( containsImageMediaType || containsVideoMediaType) {415 if (shouldPresentDocumentMenuViewController) { 409 416 // FIXME: UIDocumentMenuViewController is deprecated, we should use UIDocumentPickerViewController instead. 410 // FIXME : Support multiple file selection when implemented. <rdar://17177981>417 // FIXME 49963514: Support multiple file selection 411 418 _documentMenuController = adoptNS([[UIDocumentMenuViewController alloc] _initIgnoringApplicationEntitlementForImportOfTypes:documentTypes]); 412 419 [_documentMenuController setDelegate:self]; … … 427 434 } else { 428 435 // Image and Video types are not accepted so bypass the menu and open the file picker directly. 429 // FIXME : Support multiple file selection when implemented. <rdar://17177981>436 // FIXME 49963514: Support multiple file selection 430 437 _documentPickerController = adoptNS([[UIDocumentPickerViewController alloc] initWithDocumentTypes:documentTypes inMode:UIDocumentPickerModeImport]); 431 438 [_documentPickerController setDelegate:self]; … … 545 552 #pragma mark - UIDocumentPickerControllerDelegate implementation 546 553 547 IGNORE_WARNINGS_BEGIN("deprecated-implementations") 548 - (void)documentPicker:(UIDocumentPickerViewController *)documentPicker didPickDocumentAtURL:(NSURL *)url 549 IGNORE_WARNINGS_END 550 { 554 - (void)documentPicker:(UIDocumentPickerViewController *)controller didPickDocumentsAtURLs:(NSArray <NSURL *> *)urls 555 { 556 // FIXME 49963514: Support multiple file selection 557 ASSERT(urls.count == 1); 558 NSURL *url = urls[0]; 551 559 [self _dismissDisplayAnimated:YES]; 552 [self _chooseFiles: @[url]displayString:url.lastPathComponent iconImage:iconForFile(url)];560 [self _chooseFiles:urls displayString:url.lastPathComponent iconImage:iconForFile(url)]; 553 561 } 554 562
Note: See TracChangeset
for help on using the changeset viewer.