Changeset 120410 in webkit

Timestamp:

Jun 14, 2012, 11:38:25 PM (14 years ago)

Author:

tkent@chromium.org

Message:

Support file extensions in HTMLInputElement::accept
​https://bugs.webkit.org/show_bug.cgi?id=88298

Reviewed by Hajime Morita.

Source/WebCore:

The WHATWG specification added file extensions supoprt for
HTMLInputElement::accept recently.

In the WebCore FileChooser interface, we rejected invalid MIME type
strings in HTMLInputElement::acceptMIMETypes(), and platform file
choosers don't expect that it containts file extensions. So, this patch
introduces additional member "acceptFileExtensions" to
FileChooserSettings, and it contains only file extensions specified by
an accept attribute.

• html/FileInputType.cpp:

Sets HTMLInputElement::acceptFileExtensions() to
FileChooserSettings::acceptFileExtensions.
(WebCore::FileInputType::handleDOMActivateEvent):
(WebCore::FileInputType::receiveDropForDirectoryUpload):

• html/HTMLInputElement.cpp:

(WebCore::isValidFileExtension): Added.
(WebCore::parseAcceptAttribute):
Common part for acceptMIMETyps() and acceptFileExtensions().
(WebCore::HTMLInputElement::acceptMIMETypes):
Uses parseAcceptAttribute() with isValidMIMEType().
(WebCore::HTMLInputElement::acceptFileExtensions):
Added. Uses parseAcceptAttribute() with isValidFileExtension().

• html/HTMLInputElement.h:

(HTMLInputElement): Add acceptFileExtensions().

• platform/FileChooser.h:

(FileChooserSettings): Add acceptFileExtensions and acceptTypes().

• platform/FileChooser.cpp:

(WebCore::FileChooserSettings::acceptTypes): Added.

Source/WebKit/chromium:

• src/ChromeClientImpl.cpp:

(WebKit::ChromeClientImpl::runOpenPanel):
Use FileChooserSettings::acceptTypes() to get both of MIME types and file extensions.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/FileInputType.cpp (modified) (2 diffs)
• WebCore/html/HTMLInputElement.cpp (modified) (2 diffs)
• WebCore/html/HTMLInputElement.h (modified) (1 diff)
• WebCore/platform/FileChooser.cpp (modified) (1 diff)
• WebCore/platform/FileChooser.h (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/ChromeClientImpl.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-14  Kent Tamura  <tkent@chromium.org>
+
+        Support file extensions in HTMLInputElement::accept
+        https://bugs.webkit.org/show_bug.cgi?id=88298
+
+        Reviewed by Hajime Morita.
+
+        The WHATWG specification added file extensions supoprt for
+        HTMLInputElement::accept recently.
+
+        In the WebCore FileChooser interface, we rejected invalid MIME type
+        strings in HTMLInputElement::acceptMIMETypes(), and platform file
+        choosers don't expect that it containts file extensions. So, this patch
+        introduces additional member "acceptFileExtensions" to
+        FileChooserSettings, and it contains only file extensions specified by
+        an accept attribute.
+
+        * html/FileInputType.cpp:
+        Sets HTMLInputElement::acceptFileExtensions() to
+        FileChooserSettings::acceptFileExtensions.
+        (WebCore::FileInputType::handleDOMActivateEvent):
+        (WebCore::FileInputType::receiveDropForDirectoryUpload):
+        * html/HTMLInputElement.cpp:
+        (WebCore::isValidFileExtension): Added.
+        (WebCore::parseAcceptAttribute):
+        Common part for acceptMIMETyps() and acceptFileExtensions().
+        (WebCore::HTMLInputElement::acceptMIMETypes):
+        Uses parseAcceptAttribute() with isValidMIMEType().
+        (WebCore::HTMLInputElement::acceptFileExtensions):
+        Added. Uses parseAcceptAttribute() with isValidFileExtension().
+        * html/HTMLInputElement.h:
+        (HTMLInputElement): Add acceptFileExtensions().
+        * platform/FileChooser.h:
+        (FileChooserSettings): Add acceptFileExtensions and acceptTypes().
+        * platform/FileChooser.cpp:
+        (WebCore::FileChooserSettings::acceptTypes): Added.
+
 2012-06-14  James Robinson  <jamesr@chromium.org>
 

trunk/Source/WebCore/html/FileInputType.cpp

@@ -189 +189 @@
 #endif
         settings.acceptMIMETypes = input->acceptMIMETypes();
+        settings.acceptFileExtensions = input->acceptFileExtensions();
         settings.selectedFiles = m_fileList->paths();
 #if ENABLE(MEDIA_CAPTURE)
@@ -376 +377 @@
         settings.selectedFiles.append(paths[0]);
         settings.acceptMIMETypes = input->acceptMIMETypes();
+        settings.acceptFileExtensions = input->acceptFileExtensions();
         chrome->enumerateChosenDirectory(newFileChooser(settings));
     }

trunk/Source/WebCore/html/HTMLInputElement.cpp

@@ -1136 +1136 @@
 }
 
-static inline bool isValidMIMEType(const String& type)
+static bool isValidMIMEType(const String& type)
 {
     size_t slashPosition = type.find('/');
@@ -1148 +1148 @@
 }
 
-Vector<String> HTMLInputElement::acceptMIMETypes()
-{
-    Vector<String> mimeTypes;
-
-    String acceptString = accept();
+static bool isValidFileExtension(const String& type)
+{
+    if (type.length() < 2)
+        return false;
+    return type[0] == '.';
+}
+
+static Vector<String> parseAcceptAttribute(const String& acceptString, bool (*predicate)(const String&))
+{
+    Vector<String> types;
     if (acceptString.isEmpty())
-        return mimeTypes;
+        return types;
 
     Vector<String> splitTypes;
     acceptString.split(',', false, splitTypes);
     for (size_t i = 0; i < splitTypes.size(); ++i) {
-        String trimmedMimeType = stripLeadingAndTrailingHTMLSpaces(splitTypes[i]);
-        if (trimmedMimeType.isEmpty())
+        String trimmedType = stripLeadingAndTrailingHTMLSpaces(splitTypes[i]);
+        if (trimmedType.isEmpty())
             continue;
-        if (!isValidMIMEType(trimmedMimeType))
+        if (!predicate(trimmedType))
             continue;
-        mimeTypes.append(trimmedMimeType.lower());
-    }
-
-    return mimeTypes;
+        types.append(trimmedType.lower());
+    }
+
+    return types;
+}
+
+Vector<String> HTMLInputElement::acceptMIMETypes()
+{
+    return parseAcceptAttribute(fastGetAttribute(acceptAttr), isValidMIMEType);
+}
+
+Vector<String> HTMLInputElement::acceptFileExtensions()
+{
+    return parseAcceptAttribute(fastGetAttribute(acceptAttr), isValidFileExtension);
 }
 

trunk/Source/WebCore/html/HTMLInputElement.h

@@ -198 +198 @@
 
     Vector<String> acceptMIMETypes();
+    Vector<String> acceptFileExtensions();
     String accept() const;
     String alt() const;

trunk/Source/WebCore/platform/FileChooser.cpp

@@ -100 +100 @@
 }
 
+Vector<String> FileChooserSettings::acceptTypes() const
+{
+    Vector<String> acceptTypes;
+    acceptTypes.reserveCapacity(acceptMIMETypes.size() + acceptFileExtensions.size());
+    acceptTypes.append(acceptMIMETypes);
+    acceptTypes.append(acceptFileExtensions);
+    return acceptTypes;
 }
+
+}

trunk/Source/WebCore/platform/FileChooser.h

@@ -56 +56 @@
 #endif
     Vector<String> acceptMIMETypes;
+    Vector<String> acceptFileExtensions;
     Vector<String> selectedFiles;
 #if ENABLE(MEDIA_CAPTURE)
     String capture;
 #endif
+
+    // Returns a combined vector of acceptMIMETypes and acceptFileExtensions.
+    Vector<String> acceptTypes() const;
 };
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-06-14  Kent Tamura  <tkent@chromium.org>
+
+        Support file extensions in HTMLInputElement::accept
+        https://bugs.webkit.org/show_bug.cgi?id=88298
+
+        Reviewed by Hajime Morita.
+
+        * src/ChromeClientImpl.cpp:
+        (WebKit::ChromeClientImpl::runOpenPanel):
+        Use FileChooserSettings::acceptTypes() to get both of MIME types and file extensions.
+
 2012-06-14  Kaustubh Atrawalkar  <kaustubh@motorola.com>
 

trunk/Source/WebKit/chromium/src/ChromeClientImpl.cpp

@@ -719 +719 @@
     params.directory = false;
 #endif
-    params.acceptTypes = fileChooser->settings().acceptMIMETypes;
+    params.acceptTypes = fileChooser->settings().acceptTypes();
     params.selectedFiles = fileChooser->settings().selectedFiles;
     if (params.selectedFiles.size() > 0)