<!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>[182049] trunk/Source/WebKit2</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/182049">182049</a></dd>
<dt>Author</dt> <dd>jhoneycutt@apple.com</dd>
<dt>Date</dt> <dd>2015-03-26 19:24:55 -0700 (Thu, 26 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>iOS file upload panel menu items need icons
<https://bugs.webkit.org/show_bug.cgi?id=143042>
<rdar://problem/20178678>
Reviewed by Andy Estes.
* Platform/spi/ios/UIKitSPI.h:
Declare new SPI methods _UIImageGetWebKitTakePhotoOrVideoIcon and
_UIImageGetWebKitPhotoLibraryIcon().
* UIProcess/ios/forms/WKFileUploadPanel.mm:
(photoLibraryIcon):
(cameraIcon):
If UIKit SPI exists, use it. Otherwise, return nil.
(-[WKFileUploadPanel _showDocumentPickerMenu]):
Use icons.</pre>
<h3>Modified Paths</h3>
<ul>
<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="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182048 => 182049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-03-27 01:53:07 UTC (rev 182048)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-27 02:24:55 UTC (rev 182049)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-03-25 Jon Honeycutt <jhoneycutt@apple.com>
+
+ iOS file upload panel menu items need icons
+ <https://bugs.webkit.org/show_bug.cgi?id=143042>
+ <rdar://problem/20178678>
+
+ Reviewed by Andy Estes.
+
+ * Platform/spi/ios/UIKitSPI.h:
+ Declare new SPI methods _UIImageGetWebKitTakePhotoOrVideoIcon and
+ _UIImageGetWebKitPhotoLibraryIcon().
+
+ * UIProcess/ios/forms/WKFileUploadPanel.mm:
+ (photoLibraryIcon):
+ (cameraIcon):
+ If UIKit SPI exists, use it. Otherwise, return nil.
+
+ (-[WKFileUploadPanel _showDocumentPickerMenu]):
+ Use icons.
+
</ins><span class="cx"> 2015-03-26 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> OS X build fix after r182037.
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformspiiosUIKitSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h (182048 => 182049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2015-03-27 01:53:07 UTC (rev 182048)
+++ trunk/Source/WebKit2/Platform/spi/ios/UIKitSPI.h 2015-03-27 02:24:55 UTC (rev 182049)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #import <UIKit/UIGestureRecognizer_Private.h>
</span><span class="cx"> #import <UIKit/UIImagePickerController_Private.h>
</span><span class="cx"> #import <UIKit/UIImage_Private.h>
</span><ins>+#import <UIKit/UIInterface_Private.h>
</ins><span class="cx"> #import <UIKit/UIKeyboardImpl.h>
</span><span class="cx"> #import <UIKit/UIKeyboardIntl.h>
</span><span class="cx"> #import <UIKit/UIKeyboard_Private.h>
</span><span class="lines">@@ -699,6 +700,9 @@
</span><span class="cx">
</span><span class="cx"> void UIImageDataWriteToSavedPhotosAlbum(NSData *imageData, id completionTarget, SEL completionSelector, void *contextInfo);
</span><span class="cx">
</span><ins>+UIImage* _UIImageGetWebKitPhotoLibraryIcon(void);
+UIImage* _UIImageGetWebKitTakePhotoOrVideoIcon(void);
+
</ins><span class="cx"> extern const float UIWebViewGrowsAndShrinksToFitHeight;
</span><span class="cx"> extern const float UIWebViewScalesToFitScale;
</span><span class="cx"> extern const float UIWebViewStandardViewportWidth;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosformsWKFileUploadPanelmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm (182048 => 182049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm 2015-03-27 01:53:07 UTC (rev 182048)
+++ trunk/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm 2015-03-27 02:24:55 UTC (rev 182049)
</span><span class="lines">@@ -57,6 +57,28 @@
</span><span class="cx"> SOFT_LINK_CONSTANT(CoreMedia, kCMTimeZero, CMTime);
</span><span class="cx"> #define kCMTimeZero getkCMTimeZero()
</span><span class="cx">
</span><ins>+#pragma mark - Document picker icons
+
+static inline UIImage *photoLibraryIcon()
+{
+ // FIXME: Remove when a new SDK is available. <rdar://problem/20150072>
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000 && defined(HAVE_WEBKIT_DOC_PICKER_ICONS)
+ return _UIImageGetWebKitPhotoLibraryIcon();
+#else
+ return nil;
+#endif
+}
+
+static inline UIImage *cameraIcon()
+{
+ // FIXME: Remove when a new SDK is available. <rdar://problem/20150072>
+#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000 && defined(HAVE_WEBKIT_DOC_PICKER_ICONS)
+ return _UIImageGetWebKitTakePhotoOrVideoIcon();
+#else
+ return nil;
+#endif
+}
+
</ins><span class="cx"> #pragma mark - Icon generation
</span><span class="cx">
</span><span class="cx"> static CGRect squareCropRectForSize(CGSize size)
</span><span class="lines">@@ -491,13 +513,12 @@
</span><span class="cx"> [_documentMenuController initWithDocumentTypes:[self _documentPickerMenuMediaTypes] inMode:UIDocumentPickerModeImport];
</span><span class="cx"> [_documentMenuController setDelegate:self];
</span><span class="cx">
</span><del>- // FIXME: Need icons for Camera and Photo Library options.
- [_documentMenuController addOptionWithTitle:[self _photoLibraryButtonLabel] image:nil order:UIDocumentMenuOrderFirst handler:^{
</del><ins>+ [_documentMenuController addOptionWithTitle:[self _photoLibraryButtonLabel] image:photoLibraryIcon() order:UIDocumentMenuOrderFirst handler:^{
</ins><span class="cx"> [self _showPhotoPickerWithSourceType:UIImagePickerControllerSourceTypePhotoLibrary];
</span><span class="cx"> }];
</span><span class="cx">
</span><span class="cx"> if (NSString *cameraString = [self _cameraButtonLabel]) {
</span><del>- [_documentMenuController addOptionWithTitle:cameraString image:nil order:UIDocumentMenuOrderFirst handler:^{
</del><ins>+ [_documentMenuController addOptionWithTitle:cameraString image:cameraIcon() order:UIDocumentMenuOrderFirst handler:^{
</ins><span class="cx"> _usingCamera = YES;
</span><span class="cx"> [self _showPhotoPickerWithSourceType:UIImagePickerControllerSourceTypeCamera];
</span><span class="cx"> }];
</span></span></pre>
</div>
</div>
</body>
</html>