Attachment 360609 Details for Bug 193998 – Patch

[patch] Patch

bug-193998-20190130133051.patch (text/plain), 1.80 KB, created by Conrad Shultz on 2019-01-30 13:30:52 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Conrad Shultz

Created: 2019-01-30 13:30:52 PST

Size: 1.80 KB

patch

obsolete

>Subversion Revision: 240697
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 65e53835f5a8ac2973ed4f11db784866a6833516..b77d51a828b3684c9ac434498bc5028b7ea65e2b 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-01-29  Conrad Shultz  <conrad_shultz@apple.com>
>+
>+        Ensure image picker sourceType is set before cameraDevice
>+        https://bugs.webkit.org/show_bug.cgi?id=193998
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/ios/forms/WKFileUploadPanel.mm:
>+        (-[WKFileUploadPanel _showPhotoPickerWithSourceType:]):
>+
> 2019-01-29  Alex Christensen  <achristensen@webkit.org>
> 
>         Change NetworkConnectionToWebProcess* to NetworkConnectionToWebProcess& where possible
>diff --git a/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm b/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm
>index 877114fcf266e992aebdd90360406a1d89751df6..ef6a542f270712df64abac7aef1a8ea1c19756af 100644
>--- a/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm
>+++ b/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm
>@@ -415,10 +415,10 @@ - (void)_showPhotoPickerWithSourceType:(UIImagePickerControllerSourceType)source
>     ASSERT([UIImagePickerController isSourceTypeAvailable:sourceType]);
> 
>     _imagePicker = adoptNS([[UIImagePickerController alloc] init]);
>-    [self _configureImagePicker:_imagePicker.get()];
>     [_imagePicker setSourceType:sourceType];
>     [_imagePicker setMediaTypes:[self _mediaTypesForPickerSourceType:sourceType]];
>-    
>+    [self _configureImagePicker:_imagePicker.get()];
>+
>     // Use a popover on the iPad if the source type is not the camera.
>     // The camera will use a fullscreen, modal view controller.
>     BOOL usePopover = currentUserInterfaceIdiomIsPad() && sourceType != UIImagePickerControllerSourceTypeCamera;

Flags:

bdakin: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 193998: 360609