Changeset 170952 in webkit

Timestamp:

Jul 9, 2014, 9:38:13 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[iOS] Use UIAlertController API in WKFileUploadPanel instead of SPI
​https://bugs.webkit.org/show_bug.cgi?id=134777

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2014-07-09
Reviewed by Sam Weinig.

• UIProcess/ios/forms/WKFileUploadPanel.mm:

(-[WKFileUploadPanel _showMediaSourceSelectionSheet]):

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-07-09  Joseph Pecoraro  <pecoraro@apple.com>
+
+        [iOS] Use UIAlertController API in WKFileUploadPanel instead of SPI
+        https://bugs.webkit.org/show_bug.cgi?id=134777
+
+        Reviewed by Sam Weinig.
+
+        * UIProcess/ios/forms/WKFileUploadPanel.mm:
+        (-[WKFileUploadPanel _showMediaSourceSelectionSheet]):
+
 2014-07-09  Shivakumar JM  <shiva.jm@samsung.com>
 

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

@@ -42 +42 @@
 #import <CoreMedia/CoreMedia.h>
 #import <MobileCoreServices/MobileCoreServices.h>
-#import <UIKit/UIAlertController_Private.h>
 #import <UIKit/UIApplication_Private.h>
 #import <UIKit/UIImagePickerController_Private.h>
@@ -389 +388 @@
         cameraString = WEB_UI_STRING_KEY("Take Photo", "Take Photo (file upload action sheet)", "File Upload alert sheet camera button string for taking only photos");
 
-    _actionSheetController = [UIAlertController _alertControllerWithTitle:nil message:nil];
-    [_actionSheetController setPreferredStyle:UIAlertControllerStyleActionSheet];
-
-    [_actionSheetController _addActionWithTitle:cancelString style:UIAlertActionStyleCancel handler:^{
+    _actionSheetController = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
+
+    UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:cancelString style:UIAlertActionStyleCancel handler:^(UIAlertAction *){
         [self _cancel];
         // We handled cancel ourselves. Prevent the popover controller delegate from cancelling when the popover dismissed.
@@ -398 +396 @@
     }];
 
-    [_actionSheetController _addActionWithTitle:cameraString style:UIAlertActionStyleDefault handler:^{
+    UIAlertAction *cameraAction = [UIAlertAction actionWithTitle:cameraString style:UIAlertActionStyleDefault handler:^(UIAlertAction *){
         _usingCamera = YES;
         [self _showPhotoPickerWithSourceType:UIImagePickerControllerSourceTypeCamera];
     }];
 
-    [_actionSheetController _addActionWithTitle:existingString style:UIAlertActionStyleDefault handler:^{
+    UIAlertAction *photoLibraryAction = [UIAlertAction actionWithTitle:existingString style:UIAlertActionStyleDefault handler:^(UIAlertAction *){
         [self _showPhotoPickerWithSourceType:UIImagePickerControllerSourceTypePhotoLibrary];
     }];
+
+    [_actionSheetController addAction:cancelAction];
+    [_actionSheetController addAction:cameraAction];
+    [_actionSheetController addAction:photoLibraryAction];
 
     if (UICurrentUserInterfaceIdiomIsPad())