Changeset 238674 in webkit

Timestamp:

Nov 29, 2018, 10:26:46 AM (8 years ago)

Author:

Conrad Shultz

Message:

Factor out configuration of the file upload image picker
​https://bugs.webkit.org/show_bug.cgi?id=192138
<rdar://problem/46334871>

Reviewed by Tim Horton.

By factoring configuration of the picker into its own method, it makes it easier
to apply custom configuration in subclasses in the future.

• UIProcess/ios/forms/WKFileUploadPanel.mm:

(-[WKFileUploadPanel _showPhotoPickerWithSourceType:]):
(-[WKFileUploadPanel _configureImagePicker:]):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/forms/WKFileUploadPanel.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-11-29  Conrad Shultz  <conrad_shultz@apple.com>
+
+        Factor out configuration of the file upload image picker
+        https://bugs.webkit.org/show_bug.cgi?id=192138
+        <rdar://problem/46334871>
+
+        Reviewed by Tim Horton.
+
+        By factoring configuration of the picker into its own method, it makes it easier
+        to apply custom configuration in subclasses in the future.
+
+        * UIProcess/ios/forms/WKFileUploadPanel.mm:
+        (-[WKFileUploadPanel _showPhotoPickerWithSourceType:]):
+        (-[WKFileUploadPanel _configureImagePicker:]):
+
 2018-11-29  Tomas Popela  <tpopela@redhat.com>
 

trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm

@@ -414 +414 @@
 {
     ASSERT([UIImagePickerController isSourceTypeAvailable:sourceType]);
-    
+
     _imagePicker = adoptNS([[UIImagePickerController alloc] init]);
-    [_imagePicker setDelegate:self];
+    [self _configureImagePicker:_imagePicker.get()];
     [_imagePicker setSourceType:sourceType];
-    [_imagePicker setAllowsEditing:NO];
-    [_imagePicker setModalPresentationStyle:UIModalPresentationFullScreen];
-    [_imagePicker _setAllowsMultipleSelection:_allowMultipleFiles];
     [_imagePicker setMediaTypes:[self _mediaTypesForPickerSourceType:sourceType]];
-
-    if (_mediaCaptureType != WebCore::MediaCaptureTypeNone)
-        [_imagePicker setCameraDevice:cameraDeviceForMediaCaptureType(_mediaCaptureType)];
     
     // Use a popover on the iPad if the source type is not the camera.
@@ -433 +427 @@
     else
         [self _presentFullscreenViewController:_imagePicker.get() animated:YES];
+}
+
+- (void)_configureImagePicker:(UIImagePickerController *)imagePicker
+{
+    [imagePicker setDelegate:self];
+    [imagePicker setAllowsEditing:NO];
+    [imagePicker setModalPresentationStyle:UIModalPresentationFullScreen];
+    [imagePicker _setAllowsMultipleSelection:_allowMultipleFiles];
+
+    if (_mediaCaptureType != WebCore::MediaCaptureTypeNone)
+        [imagePicker setCameraDevice:cameraDeviceForMediaCaptureType(_mediaCaptureType)];
 }