HTML file input elements do not support file extensions in the "accept" attribute

https://bugs.webkit.org/show_bug.cgi?id=95698
<rdar://problem/12231850>

Reviewed by Darin Adler.

Source/WebCore:

Serialize the accepted file extensions so they can be accessed in the UI process.

* platform/FileChooser.h:
* platform/FileChooser.cpp:
(WebCore::FileChooser::invalidate): Modernize.
(WebCore::FileChooserSettings::acceptTypes const): Deleted.
This is dead code, it was only used by Chromium.

Source/WebKit:

Plumb accepted file extensions out to the C API.
The Cocoa API will be improved in a later patch.

* Shared/WebCoreArgumentCoders.cpp:
(IPC::ArgumentCoder<FileChooserSettings>::encode):
(IPC::ArgumentCoder<FileChooserSettings>::decode):
* UIProcess/API/APIOpenPanelParameters.cpp:
(API::OpenPanelParameters::acceptFileExtensions const):
* UIProcess/API/APIOpenPanelParameters.h:
* UIProcess/API/C/WKOpenPanelParametersRef.cpp:
(WKOpenPanelParametersCopyAcceptedFileExtensions):
* UIProcess/API/C/WKOpenPanelParametersRef.h:

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

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 026a2f976eb7e934f1b4f700c7cc1a66e5e56870..03419914c2a6322ecdf38f67babd6da1ea6edd12 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2017-08-01  Brian Burg  <bburg@apple.com>
+
+        HTML file input elements do not support file extensions in the "accept" attribute
+        https://bugs.webkit.org/show_bug.cgi?id=95698
+        <rdar://problem/12231850>
+
+        Reviewed by Darin Adler.
+
+        Serialize the accepted file extensions so they can be accessed in the UI process.
+
+        * platform/FileChooser.h:
+        * platform/FileChooser.cpp:
+        (WebCore::FileChooser::invalidate): Modernize.
+        (WebCore::FileChooserSettings::acceptTypes const): Deleted.
+        This is dead code, it was only used by Chromium.
+
 2017-08-02  Fujii Hironori  <Hironori.Fujii@sony.com>
 
         Use LazyNeverDestroyed instead of DEFINE_GLOBAL for QualifiedName

diff --git a/Source/WebCore/platform/FileChooser.cpp b/Source/WebCore/platform/FileChooser.cpp
index eada49ba627beae1d7de45a7fce1eda673faf723..f30c49f15abf3858884eddcf04ac35fd9f033fed 100644 (file)
--- a/Source/WebCore/platform/FileChooser.cpp
+++ b/Source/WebCore/platform/FileChooser.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2017 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -50,7 +50,7 @@ void FileChooser::invalidate()
 {
     ASSERT(m_client);
 
-    m_client = 0;
+    m_client = nullptr;
 }
 
 void FileChooser::chooseFile(const String& filename)
@@ -110,13 +110,4 @@ void FileChooser::chooseFiles(const Vector<FileChooserFileInfo>& files)
         m_client->filesChosen(files);
 }
 
-Vector<String> FileChooserSettings::acceptTypes() const
-{
-    Vector<String> acceptTypes;
-    acceptTypes.reserveCapacity(acceptMIMETypes.size() + acceptFileExtensions.size());
-    acceptTypes.appendVector(acceptMIMETypes);
-    acceptTypes.appendVector(acceptFileExtensions);
-    return acceptTypes;
-}
-
-}
+} // namespace WebCore

diff --git a/Source/WebCore/platform/FileChooser.h b/Source/WebCore/platform/FileChooser.h
index 7e3290f18181a210acc82b764f0e8803f1f25d5d..072714b35803ca0bb0d36222ee7bc93678180726 100644 (file)
--- a/Source/WebCore/platform/FileChooser.h
+++ b/Source/WebCore/platform/FileChooser.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2006-2017 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -41,7 +41,7 @@ enum MediaCaptureType {
     MediaCaptureTypeUser,
     MediaCaptureTypeEnvironment
 };
-    
+
 class FileChooser;
 class Icon;
 
@@ -64,9 +64,6 @@ struct FileChooserSettings {
 #if ENABLE(MEDIA_CAPTURE)
     MediaCaptureType mediaCaptureType;
 #endif
-
-    // Returns a combined vector of acceptMIMETypes and acceptFileExtensions.
-    Vector<String> acceptTypes() const;
 };
 
 class FileChooserClient {
@@ -89,7 +86,7 @@ public:
     // FIXME: This function is almost identical to FileChooser::chooseFiles(). We should merge this
     // function with FileChooser::chooseFiles() and hence remove the PLATFORM(IOS)-guard.
     WEBCORE_EXPORT void chooseMediaFiles(const Vector<String>& paths, const String& displayString, Icon*);
-#endif    
+#endif
 
     // FIXME: We should probably just pass file paths that could be virtual paths with proper display names rather than passing structs.
     void chooseFiles(const Vector<FileChooserFileInfo>& files);
@@ -99,7 +96,7 @@ public:
 private:
     FileChooser(FileChooserClient*, const FileChooserSettings&);
 
-    FileChooserClient* m_client;
+    FileChooserClient* m_client { nullptr };
     FileChooserSettings m_settings;
 };
 

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index bc81815902bfafec835c8ae3e3fe110fc6a325b0..b3351c499503bc501b191c9dcb63cde5bbd95515 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,24 @@
+2017-08-01  Brian Burg  <bburg@apple.com>
+
+        HTML file input elements do not support file extensions in the "accept" attribute
+        https://bugs.webkit.org/show_bug.cgi?id=95698
+        <rdar://problem/12231850>
+
+        Reviewed by Darin Adler.
+
+        Plumb accepted file extensions out to the C API.
+        The Cocoa API will be improved in a later patch.
+
+        * Shared/WebCoreArgumentCoders.cpp:
+        (IPC::ArgumentCoder<FileChooserSettings>::encode):
+        (IPC::ArgumentCoder<FileChooserSettings>::decode):
+        * UIProcess/API/APIOpenPanelParameters.cpp:
+        (API::OpenPanelParameters::acceptFileExtensions const):
+        * UIProcess/API/APIOpenPanelParameters.h:
+        * UIProcess/API/C/WKOpenPanelParametersRef.cpp:
+        (WKOpenPanelParametersCopyAcceptedFileExtensions):
+        * UIProcess/API/C/WKOpenPanelParametersRef.h:
+
 2017-08-02  Fujii Hironori  <Hironori.Fujii@sony.com>
 
         Use LazyNeverDestroyed instead of DEFINE_GLOBAL for QualifiedName

diff --git a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp
index 130d63d8fc4fdcea4e32e9becf6a7f5f40698a81..99c3954dc95a6afc7ba27450ac8fd6bcc6b09907 100644 (file)
--- a/Source/WebKit/Shared/WebCoreArgumentCoders.cpp
+++ b/Source/WebKit/Shared/WebCoreArgumentCoders.cpp
@@ -1560,6 +1560,7 @@ void ArgumentCoder<FileChooserSettings>::encode(Encoder& encoder, const FileChoo
 {
     encoder << settings.allowsMultipleFiles;
     encoder << settings.acceptMIMETypes;
+    encoder << settings.acceptFileExtensions;
     encoder << settings.selectedFiles;
 #if ENABLE(MEDIA_CAPTURE)
     encoder.encodeEnum(settings.mediaCaptureType);
@@ -1572,6 +1573,8 @@ bool ArgumentCoder<FileChooserSettings>::decode(Decoder& decoder, FileChooserSet
         return false;
     if (!decoder.decode(settings.acceptMIMETypes))
         return false;
+    if (!decoder.decode(settings.acceptFileExtensions))
+        return false;
     if (!decoder.decode(settings.selectedFiles))
         return false;
 #if ENABLE(MEDIA_CAPTURE)

diff --git a/Source/WebKit/UIProcess/API/APIOpenPanelParameters.cpp b/Source/WebKit/UIProcess/API/APIOpenPanelParameters.cpp
index d1442a3ea72dff8c0a84f6d8c5fc922b29dc99b5..771990a74c13e693b3aa8a7cae5b3a7778183ccc 100644 (file)
--- a/Source/WebKit/UIProcess/API/APIOpenPanelParameters.cpp
+++ b/Source/WebKit/UIProcess/API/APIOpenPanelParameters.cpp
@@ -54,6 +54,11 @@ Ref<API::Array> OpenPanelParameters::acceptMIMETypes() const
     return API::Array::createStringArray(m_settings.acceptMIMETypes);
 }
 
+Ref<API::Array> OpenPanelParameters::acceptFileExtensions() const
+{
+    return API::Array::createStringArray(m_settings.acceptFileExtensions);
+}
+
 #if ENABLE(MEDIA_CAPTURE)
 WebCore::MediaCaptureType OpenPanelParameters::mediaCaptureType() const
 {

diff --git a/Source/WebKit/UIProcess/API/APIOpenPanelParameters.h b/Source/WebKit/UIProcess/API/APIOpenPanelParameters.h
index ddf7a4ced020d38f2c7e273d523d107899c1ab1e..3cd0da66a32efedd8a6990214b4b31523a204f33 100644 (file)
--- a/Source/WebKit/UIProcess/API/APIOpenPanelParameters.h
+++ b/Source/WebKit/UIProcess/API/APIOpenPanelParameters.h
@@ -40,6 +40,7 @@ public:
 
     bool allowMultipleFiles() const { return m_settings.allowsMultipleFiles; }
     Ref<API::Array> acceptMIMETypes() const;
+    Ref<API::Array> acceptFileExtensions() const;
     Ref<API::Array> selectedFileNames() const;
 #if ENABLE(MEDIA_CAPTURE)
     WebCore::MediaCaptureType mediaCaptureType() const;

diff --git a/Source/WebKit/UIProcess/API/C/WKOpenPanelParametersRef.cpp b/Source/WebKit/UIProcess/API/C/WKOpenPanelParametersRef.cpp
index c8ad8da0fe5dd12f955323d4ace91f82f624b1cf..f0eac0b7f699d84c1c156fff061b52f87bb90d2c 100644 (file)
--- a/Source/WebKit/UIProcess/API/C/WKOpenPanelParametersRef.cpp
+++ b/Source/WebKit/UIProcess/API/C/WKOpenPanelParametersRef.cpp
@@ -48,6 +48,11 @@ WKArrayRef WKOpenPanelParametersCopyAcceptedMIMETypes(WKOpenPanelParametersRef p
     return toAPI(&toImpl(parametersRef)->acceptMIMETypes().leakRef());
 }
 
+WKArrayRef WKOpenPanelParametersCopyAcceptedFileExtensions(WKOpenPanelParametersRef parametersRef)
+{
+    return toAPI(&toImpl(parametersRef)->acceptFileExtensions().leakRef());
+}
+
 // Deprecated.
 WKStringRef WKOpenPanelParametersCopyCapture(WKOpenPanelParametersRef)
 {

diff --git a/Source/WebKit/UIProcess/API/C/WKOpenPanelParametersRef.h b/Source/WebKit/UIProcess/API/C/WKOpenPanelParametersRef.h
index d8ca7c40dac451751237f3a5b11b580275543aaf..f51c5de07239953d1f8d4b92ac71e1471c5a3755 100644 (file)
--- a/Source/WebKit/UIProcess/API/C/WKOpenPanelParametersRef.h
+++ b/Source/WebKit/UIProcess/API/C/WKOpenPanelParametersRef.h
@@ -42,6 +42,7 @@ WK_EXPORT WKTypeID WKOpenPanelParametersGetTypeID();
 WK_EXPORT bool WKOpenPanelParametersGetAllowsMultipleFiles(WKOpenPanelParametersRef parameters);
 
 WK_EXPORT WKArrayRef WKOpenPanelParametersCopyAcceptedMIMETypes(WKOpenPanelParametersRef parameters);
+WK_EXPORT WKArrayRef WKOpenPanelParametersCopyAcceptedFileExtensions(WKOpenPanelParametersRef parameters);
 
 /* DEPRECATED - Please use WKOpenPanelParametersGetCaptureEnabled() instead. */
 WK_EXPORT WKStringRef WKOpenPanelParametersCopyCapture(WKOpenPanelParametersRef parameters);