Changeset 233864 in webkit
- Timestamp:
- Jul 16, 2018 1:32:07 PM (6 years ago)
- Location:
- trunk/Source/WebKit
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r233863 r233864 1 2018-07-16 Tim Horton <timothy_horton@apple.com> 2 3 REGRESSION (r233502): Camera in <input type=file> becomes unresponsive after attempting to dismiss it 4 https://bugs.webkit.org/show_bug.cgi?id=187706 5 <rdar://problem/42137088> 6 7 Reviewed by Wenson Hsieh. 8 9 * UIProcess/ios/forms/WKFileUploadPanel.mm: 10 Remove an unused member. 11 12 (-[WKFileUploadPanel _dismissDisplayAnimated:]): 13 Allow us to dismiss the camera view controller in addition to the menu. 14 1 15 2018-07-16 Alex Christensen <achristensen@webkit.org> 2 16 -
trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm
r233502 r233864 166 166 #pragma clang diagnostic pop 167 167 RetainPtr<UIDocumentMenuViewController> _documentMenuController; 168 RetainPtr<UIAlertController> _actionSheetController;169 168 WebCore::MediaCaptureType _mediaCaptureType; 170 169 } … … 264 263 { 265 264 // Dismiss any view controller that is being presented. This works for all types of view controllers, popovers, etc. 266 // If there is any kind of view controller presented on this view, it will be removed. 265 // If there is any kind of view controller presented on this view, it will be removed. 267 266 268 267 [[UIViewController _viewControllerForFullScreenPresentationFromView:_view] dismissViewControllerAnimated:NO completion:nil]; … … 285 284 if (_presentationViewController) { 286 285 UIViewController *currentPresentedViewController = [_presentationViewController presentedViewController]; 287 if (currentPresentedViewController == self ) {288 [currentPresentedViewController dismissViewControllerAnimated: YEScompletion:^{286 if (currentPresentedViewController == self || currentPresentedViewController == _imagePicker.get()) { 287 [currentPresentedViewController dismissViewControllerAnimated:animated completion:^{ 289 288 _presentationViewController = nil; 290 289 }];
Note: See TracChangeset
for help on using the changeset viewer.