Changeset 243790 in webkit

Timestamp:

Apr 2, 2019, 11:23:44 PM (7 years ago)

Author:

bshafiei@apple.com

Message:

Cherry-pick r243485. rdar://problem/49083324

Regression(r242369) Trying to change profile picture on linked in shows file picker, not the image picker
​https://bugs.webkit.org/show_bug.cgi?id=196205
<rdar://problem/49083324>

Reviewed by Geoffrey Garen.

Update our FileUploadPanel code on iOS to properly deal with the MIME types containing
wild cards (e.g. "image/*") that are defined in the HTML specification:

• ​https://html.spec.whatwg.org/multipage/input.html#attr-input-accept

Previously, we would fail to convert those to UTIs.

• UIProcess/ios/forms/WKFileUploadPanel.mm:

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@243485 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

tags/Safari-608.1.13.5/Source/WebKit

Files:

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

tags/Safari-608.1.13.5/Source/WebKit/ChangeLog

@@ +1 @@
+2019-04-02  Babak Shafiei  <bshafiei@apple.com>
+
+        Cherry-pick r243485. rdar://problem/49083324
+
+    Regression(r242369) Trying to change profile picture on linked in shows file picker, not the image picker
+    https://bugs.webkit.org/show_bug.cgi?id=196205
+    <rdar://problem/49083324>
+    
+    Reviewed by Geoffrey Garen.
+    
+    Update our FileUploadPanel code on iOS to properly deal with the MIME types containing
+    wild cards (e.g. "image/*") that are defined in the HTML specification:
+    - https://html.spec.whatwg.org/multipage/input.html#attr-input-accept
+    
+    Previously, we would fail to convert those to UTIs.
+    
+    * UIProcess/ios/forms/WKFileUploadPanel.mm:
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@243485 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-03-25  Chris Dumez  <cdumez@apple.com>
+
+            Regression(r242369) Trying to change profile picture on linked in shows file picker, not the image picker
+            https://bugs.webkit.org/show_bug.cgi?id=196205
+            <rdar://problem/49083324>
+
+            Reviewed by Geoffrey Garen.
+
+            Update our FileUploadPanel code on iOS to properly deal with the MIME types containing
+            wild cards (e.g. "image/*") that are defined in the HTML specification:
+            - https://html.spec.whatwg.org/multipage/input.html#attr-input-accept
+
+            Previously, we would fail to convert those to UTIs.
+
+            * UIProcess/ios/forms/WKFileUploadPanel.mm:
+
 2019-04-01  Alan Coon  <alancoon@apple.com>
 

tags/Safari-608.1.13.5/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm

@@ -319 +319 @@
     NSMutableSet *mediaTypes = [NSMutableSet set];
     for (NSString *mimeType in mimeTypes) {
-        auto uti = WebCore::UTIFromMIMEType(mimeType);
-        if (!uti.isEmpty())
-            [mediaTypes addObject:(__bridge NSString *)uti];
+        if ([mimeType caseInsensitiveCompare:@"image/*"] == NSOrderedSame)
+            [mediaTypes addObject:(__bridge NSString *)kUTTypeImage];
+        else if ([mimeType caseInsensitiveCompare:@"video/*"] == NSOrderedSame)
+            [mediaTypes addObject:(__bridge NSString *)kUTTypeMovie];
+        else if ([mimeType caseInsensitiveCompare:@"audio/*"] == NSOrderedSame)
+            [mediaTypes addObject:(__bridge NSString *)kUTTypeAudio];
+        else {
+            auto uti = WebCore::UTIFromMIMEType(mimeType);
+            if (!uti.isEmpty())
+                [mediaTypes addObject:(__bridge NSString *)uti];
+        }
     }
     return mediaTypes;