<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[195971] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/195971">195971</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2016-02-01 12:23:41 -0800 (Mon, 01 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre><rdar://problem/20150072> [iOS] Remove some file upload code only needed before iOS 9
https://bugs.webkit.org/show_bug.cgi?id=153754
Reviewed by Darin Adler.
Source/WebCore:
* English.lproj/Localizable.strings: Updated for removal of WebKit2 string.
Source/WebKit2:
* Platform/spi/ios/UIKitSPI.h: Removed conditional forward declaration of SPI.
* UIProcess/ios/forms/WKFileUploadPanel.mm:
(photoLibraryIcon): Removed check for HAVE_WEBKIT_DOC_PICKER_ICONS, which is always true in
iOS 9 and later.
(cameraIcon): Ditto.
(-[WKFileUploadPanel presentWithParameters:resultListener:]): Removed branch for when
UIDocumentMenuViewController doesn’t respond to
-_initIgnoringApplicationEntitlementForImportOfTypes:.
(-[WKFileUploadPanel _showMediaSourceSelectionSheet]): Deleted now-unused method.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreEnglishlprojLocalizablestrings">trunk/Source/WebCore/English.lproj/Localizable.strings</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformspiiosUIKitSPIh">trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosformsWKFileUploadPanelmm">trunk/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195970 => 195971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-02-01 19:45:18 UTC (rev 195970)
+++ trunk/Source/WebCore/ChangeLog 2016-02-01 20:23:41 UTC (rev 195971)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-02-01 Dan Bernstein <mitz@apple.com>
+
+ <rdar://problem/20150072> [iOS] Remove some file upload code only needed before iOS 9
+ https://bugs.webkit.org/show_bug.cgi?id=153754
+
+ Reviewed by Darin Adler.
+
+ * English.lproj/Localizable.strings: Updated for removal of WebKit2 string.
+
</ins><span class="cx"> 2016-02-01 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> Cache the Path instead of creating it every time it is required
</span></span></pre></div>
<a id="trunkSourceWebCoreEnglishlprojLocalizablestrings"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/English.lproj/Localizable.strings (195970 => 195971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/English.lproj/Localizable.strings 2016-02-01 19:45:18 UTC (rev 195970)
+++ trunk/Source/WebCore/English.lproj/Localizable.strings 2016-02-01 20:23:41 UTC (rev 195971)
</span><span class="lines">@@ -124,9 +124,6 @@
</span><span class="cx"> /* menu item title for phone number */
</span><span class="cx"> "Call Using iPhone:" = "Call Using iPhone:";
</span><span class="cx">
</span><del>-/* File Upload alert sheet button string to cancel */
-"Cancel (file upload action sheet)" = "Cancel";
-
</del><span class="cx"> /* Title for Cancel button label in button bar */
</span><span class="cx"> "Cancel button label in button bar" = "Cancel";
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (195970 => 195971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-02-01 19:45:18 UTC (rev 195970)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-01 20:23:41 UTC (rev 195971)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-02-01 Dan Bernstein <mitz@apple.com>
+
+ <rdar://problem/20150072> [iOS] Remove some file upload code only needed before iOS 9
+ https://bugs.webkit.org/show_bug.cgi?id=153754
+
+ Reviewed by Darin Adler.
+
+ * Platform/spi/ios/UIKitSPI.h: Removed conditional forward declaration of SPI.
+
+ * UIProcess/ios/forms/WKFileUploadPanel.mm:
+ (photoLibraryIcon): Removed check for HAVE_WEBKIT_DOC_PICKER_ICONS, which is always true in
+ iOS 9 and later.
+ (cameraIcon): Ditto.
+ (-[WKFileUploadPanel presentWithParameters:resultListener:]): Removed branch for when
+ UIDocumentMenuViewController doesn’t respond to
+ -_initIgnoringApplicationEntitlementForImportOfTypes:.
+ (-[WKFileUploadPanel _showMediaSourceSelectionSheet]): Deleted now-unused method.
+
</ins><span class="cx"> 2016-02-01 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Stop linking to PassKit
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformspiiosUIKitSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h (195970 => 195971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2016-02-01 19:45:18 UTC (rev 195970)
+++ trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2016-02-01 20:23:41 UTC (rev 195971)
</span><span class="lines">@@ -79,17 +79,8 @@
</span><span class="cx"> #import <UIKit/UIPreviewItemController.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-// FIXME: Unconditionally include this file when a new SDK is available. <rdar://problem/20150072>
-#if defined(__has_include) && __has_include(<UIKit/UIDocumentMenuViewController_Private.h>)
-#import <UIKit/UIDocumentMenuViewController_Private.h>
</del><span class="cx"> #else
</span><del>-@interface UIDocumentMenuViewController ()
-- (instancetype)_initIgnoringApplicationEntitlementForImportOfTypes:(NSArray *)types;
-@end
-#endif
</del><span class="cx">
</span><del>-#else
-
</del><span class="cx"> #if HAVE(LINK_PREVIEW)
</span><span class="cx"> typedef NS_ENUM(NSInteger, UIPreviewItemType) {
</span><span class="cx"> UIPreviewItemTypeNone,
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosformsWKFileUploadPanelmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm (195970 => 195971)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm 2016-02-01 19:45:18 UTC (rev 195970)
+++ trunk/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm 2016-02-01 20:23:41 UTC (rev 195971)
</span><span class="lines">@@ -73,22 +73,12 @@
</span><span class="cx">
</span><span class="cx"> static inline UIImage *photoLibraryIcon()
</span><span class="cx"> {
</span><del>- // FIXME: Remove when a new SDK is available. <rdar://problem/20150072>
-#if defined(HAVE_WEBKIT_DOC_PICKER_ICONS)
</del><span class="cx"> return _UIImageGetWebKitPhotoLibraryIcon();
</span><del>-#else
- return nil;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline UIImage *cameraIcon()
</span><span class="cx"> {
</span><del>- // FIXME: Remove when a new SDK is available. <rdar://problem/20150072>
-#if defined(HAVE_WEBKIT_DOC_PICKER_ICONS)
</del><span class="cx"> return _UIImageGetWebKitTakePhotoOrVideoIcon();
</span><del>-#else
- return nil;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark - Icon generation
</span><span class="lines">@@ -374,19 +364,7 @@
</span><span class="cx"> [mimeTypes addObject:mimeType->string()];
</span><span class="cx"> _mimeTypes = adoptNS([mimeTypes copy]);
</span><span class="cx">
</span><del>- // FIXME: Remove this check and the fallback code when a new SDK is available. <rdar://problem/20150072>
- if ([UIDocumentMenuViewController instancesRespondToSelector:@selector(_initIgnoringApplicationEntitlementForImportOfTypes:)]) {
- [self _showDocumentPickerMenu];
- return;
- }
-
- // Fall back to showing the old-style source selection sheet.
- // If there is no camera or this is type=multiple, just show the image picker for the photo library.
- // Otherwise, show an action sheet for the user to choose between camera or library.
- if (_allowMultipleFiles || ![UIImagePickerController isSourceTypeAvailable:UIImagePickerControllerSourceTypeCamera])
- [self _showPhotoPickerWithSourceType:UIImagePickerControllerSourceTypePhotoLibrary];
- else
- [self _showMediaSourceSelectionSheet];
</del><ins>+ [self _showDocumentPickerMenu];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)dismiss
</span><span class="lines">@@ -482,36 +460,6 @@
</span><span class="cx"> return WEB_UI_STRING_KEY("Take Photo", "Take Photo (file upload action sheet)", "File Upload alert sheet camera button string for taking only photos");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)_showMediaSourceSelectionSheet
-{
- NSString *existingString = [self _photoLibraryButtonLabel];
- NSString *cameraString = [self _cameraButtonLabel];
- NSString *cancelString = WEB_UI_STRING_KEY("Cancel", "Cancel (file upload action sheet)", "File Upload alert sheet button string to cancel");
-
- _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.
- [_presentationPopover setDelegate:nil];
- }];
-
- UIAlertAction *cameraAction = [UIAlertAction actionWithTitle:cameraString style:UIAlertActionStyleDefault handler:^(UIAlertAction *){
- _usingCamera = YES;
- [self _showPhotoPickerWithSourceType:UIImagePickerControllerSourceTypeCamera];
- }];
-
- UIAlertAction *photoLibraryAction = [UIAlertAction actionWithTitle:existingString style:UIAlertActionStyleDefault handler:^(UIAlertAction *){
- [self _showPhotoPickerWithSourceType:UIImagePickerControllerSourceTypePhotoLibrary];
- }];
-
- [_actionSheetController addAction:cancelAction];
- [_actionSheetController addAction:cameraAction];
- [_actionSheetController addAction:photoLibraryAction];
-
- [self _presentForCurrentInterfaceIdiom:_actionSheetController.get()];
-}
-
</del><span class="cx"> - (void)_showDocumentPickerMenu
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Support multiple file selection when implemented. <rdar://17177981>
</span></span></pre>
</div>
</div>
</body>
</html>