Title: [240769] branches/safari-607-branch/Source/WebKit
- Revision
- 240769
- Author
- bshaf...@apple.com
- Date
- 2019-01-31 00:10:27 -0800 (Thu, 31 Jan 2019)
Log Message
Cherry-pick r240729. rdar://problem/47685553
Ensure image picker sourceType is set before cameraDevice
https://bugs.webkit.org/show_bug.cgi?id=193998
Reviewed by Beth Dakin.
* UIProcess/ios/forms/WKFileUploadPanel.mm:
(-[WKFileUploadPanel _showPhotoPickerWithSourceType:]):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240729 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-607-branch/Source/WebKit/ChangeLog (240768 => 240769)
--- branches/safari-607-branch/Source/WebKit/ChangeLog 2019-01-31 08:10:24 UTC (rev 240768)
+++ branches/safari-607-branch/Source/WebKit/ChangeLog 2019-01-31 08:10:27 UTC (rev 240769)
@@ -1,5 +1,29 @@
2019-01-30 Babak Shafiei <bshaf...@apple.com>
+ Cherry-pick r240729. rdar://problem/47685553
+
+ Ensure image picker sourceType is set before cameraDevice
+ https://bugs.webkit.org/show_bug.cgi?id=193998
+
+ Reviewed by Beth Dakin.
+
+ * UIProcess/ios/forms/WKFileUploadPanel.mm:
+ (-[WKFileUploadPanel _showPhotoPickerWithSourceType:]):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240729 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-01-29 Conrad Shultz <conrad_shu...@apple.com>
+
+ Ensure image picker sourceType is set before cameraDevice
+ https://bugs.webkit.org/show_bug.cgi?id=193998
+
+ Reviewed by Beth Dakin.
+
+ * UIProcess/ios/forms/WKFileUploadPanel.mm:
+ (-[WKFileUploadPanel _showPhotoPickerWithSourceType:]):
+
+2019-01-30 Babak Shafiei <bshaf...@apple.com>
+
Cherry-pick r240578. rdar://problem/47685372
WebUserContentController::removeUserScriptMessageHandlerInternal may deref and delete itself
Modified: branches/safari-607-branch/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm (240768 => 240769)
--- branches/safari-607-branch/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm 2019-01-31 08:10:24 UTC (rev 240768)
+++ branches/safari-607-branch/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm 2019-01-31 08:10:27 UTC (rev 240769)
@@ -415,10 +415,10 @@
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;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
