<!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>[266361] trunk/Source/WebKit</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/266361">266361</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2020-08-31 11:23:58 -0700 (Mon, 31 Aug 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Upstream support for image picker confirmation and downscaling
https://bugs.webkit.org/show_bug.cgi?id=215997

Reviewed by Anders Carlsson.

* UIProcess/ios/WKContentViewInteraction.h:
* UIProcess/ios/WKContentViewInteraction.mm:
(-[WKContentView _showRunOpenPanel:frameInfo:resultListener:]):
* UIProcess/ios/forms/WKFileUploadPanel.mm:
(-[WKFileUploadPanel _showPhotoPickerWithSourceType:]):
(-[WKFileUploadPanel _configureImagePicker:]): Deleted.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformspiiosUIKitSPIh">trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKContentViewInteractionh">trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosWKContentViewInteractionmm">trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm</a></li>
<li><a href="#trunkSourceWebKitUIProcessiosformsWKFileUploadPanelmm">trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (266360 => 266361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2020-08-31 18:16:31 UTC (rev 266360)
+++ trunk/Source/WebKit/ChangeLog       2020-08-31 18:23:58 UTC (rev 266361)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2020-08-31  Tim Horton  <timothy_horton@apple.com>
+
+        Upstream support for image picker confirmation and downscaling
+        https://bugs.webkit.org/show_bug.cgi?id=215997
+
+        Reviewed by Anders Carlsson.
+
+        * UIProcess/ios/WKContentViewInteraction.h:
+        * UIProcess/ios/WKContentViewInteraction.mm:
+        (-[WKContentView _showRunOpenPanel:frameInfo:resultListener:]):
+        * UIProcess/ios/forms/WKFileUploadPanel.mm:
+        (-[WKFileUploadPanel _showPhotoPickerWithSourceType:]):
+        (-[WKFileUploadPanel _configureImagePicker:]): Deleted.
+
</ins><span class="cx"> 2020-08-31  Sam Weinig  <weinig@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Many settings in RuntimeEnabledSettings should autogenerated Settings: Part 1
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformspiiosUIKitSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h (266360 => 266361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h  2020-08-31 18:16:31 UTC (rev 266360)
+++ trunk/Source/WebKit/Platform/spi/ios/UIKitSPI.h     2020-08-31 18:23:58 UTC (rev 266361)
</span><span class="lines">@@ -265,6 +265,8 @@
</span><span class="cx"> 
</span><span class="cx"> @interface UIImagePickerController ()
</span><span class="cx"> @property (nonatomic, setter=_setAllowsMultipleSelection:) BOOL _allowsMultipleSelection;
</span><ins>+@property (nonatomic, setter=_setRequiresPickingConfirmation:) BOOL _requiresPickingConfirmation;
+@property (nonatomic, setter=_setShowsFileSizePicker:) BOOL _showsFileSizePicker;
</ins><span class="cx"> @end
</span><span class="cx"> 
</span><span class="cx"> @interface UIImage ()
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewInteractionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h (266360 => 266361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h     2020-08-31 18:16:31 UTC (rev 266360)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h        2020-08-31 18:23:58 UTC (rev 266361)
</span><span class="lines">@@ -642,8 +642,4 @@
</span><span class="cx"> @end
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-@interface WKContentView (WKFileUploadPanel)
-+ (Class)_fileUploadPanelClass;
-@end
-
</del><span class="cx"> #endif // PLATFORM(IOS_FAMILY)
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosWKContentViewInteractionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm (266360 => 266361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm    2020-08-31 18:16:31 UTC (rev 266360)
+++ trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm       2020-08-31 18:23:58 UTC (rev 266361)
</span><span class="lines">@@ -161,10 +161,6 @@
</span><span class="cx"> #import "WKWebEvent.h"
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/WKPlatformFileUploadPanel.mm>)
-#import <WebKitAdditions/WKPlatformFileUploadPanel.mm>
-#endif
-
</del><span class="cx"> #if USE(APPLE_INTERNAL_SDK)
</span><span class="cx"> #import <WebKitAdditions/WKContentViewInteractionAdditions.mm>
</span><span class="cx"> #endif
</span><span class="lines">@@ -6785,15 +6781,8 @@
</span><span class="cx">     if (_fileUploadPanel)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    Class ownClass = self.class;
-    Class panelClass = nil;
-    if ([ownClass respondsToSelector:@selector(_fileUploadPanelClass)])
-        panelClass = [ownClass _fileUploadPanelClass];
-    if (!panelClass)
-        panelClass = [WKFileUploadPanel class];
-
</del><span class="cx">     _frameInfoForFileUploadPanel = frameInfo;
</span><del>-    _fileUploadPanel = adoptNS([[panelClass alloc] initWithView:self]);
</del><ins>+    _fileUploadPanel = adoptNS([[WKFileUploadPanel alloc] initWithView:self]);
</ins><span class="cx">     [_fileUploadPanel setDelegate:self];
</span><span class="cx">     [_fileUploadPanel presentWithParameters:parameters resultListener:listener];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessiosformsWKFileUploadPanelmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm (266360 => 266361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm     2020-08-31 18:16:31 UTC (rev 266360)
+++ trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm        2020-08-31 18:23:58 UTC (rev 266361)
</span><span class="lines">@@ -556,8 +556,16 @@
</span><span class="cx">     _imagePicker = adoptNS([[UIImagePickerController alloc] init]);
</span><span class="cx">     [_imagePicker setSourceType:sourceType];
</span><span class="cx">     [_imagePicker setMediaTypes:[self _mediaTypesForPickerSourceType:sourceType]];
</span><del>-    [self _configureImagePicker:_imagePicker.get()];
</del><ins>+    [_imagePicker setDelegate:self];
+    [_imagePicker setAllowsEditing:NO];
+    [_imagePicker setModalPresentationStyle:UIModalPresentationFullScreen];
+    [_imagePicker _setAllowsMultipleSelection:_allowMultipleFiles];
+    [_imagePicker _setRequiresPickingConfirmation:YES];
+    [_imagePicker _setShowsFileSizePicker:YES];
</ins><span class="cx"> 
</span><ins>+    if (_mediaCaptureType != WebCore::MediaCaptureTypeNone)
+        [_imagePicker setCameraDevice:cameraDeviceForMediaCaptureType(_mediaCaptureType)];
+
</ins><span class="cx">     // Use a popover on the iPad if the source type is not the camera.
</span><span class="cx">     // The camera will use a fullscreen, modal view controller.
</span><span class="cx">     BOOL usePopover = currentUserInterfaceIdiomIsPad() && sourceType != UIImagePickerControllerSourceTypeCamera;
</span><span class="lines">@@ -567,17 +575,6 @@
</span><span class="cx">         [self _presentFullscreenViewController:_imagePicker.get() animated:YES];
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-- (void)_configureImagePicker:(UIImagePickerController *)imagePicker
-{
-    [imagePicker setDelegate:self];
-    [imagePicker setAllowsEditing:NO];
-    [imagePicker setModalPresentationStyle:UIModalPresentationFullScreen];
-    [imagePicker _setAllowsMultipleSelection:_allowMultipleFiles];
-
-    if (_mediaCaptureType != WebCore::MediaCaptureTypeNone)
-        [imagePicker setCameraDevice:cameraDeviceForMediaCaptureType(_mediaCaptureType)];
-}
-
</del><span class="cx"> #pragma mark - Presenting View Controllers
</span><span class="cx"> 
</span><span class="cx"> - (void)_presentMenuOptionForCurrentInterfaceIdiom:(UIViewController *)viewController
</span></span></pre>
</div>
</div>

</body>
</html>