COMMIT_MESSAGE

1filechooser

2

WebKit/chromium/ChangeLog

2009-12-12  Kent Tamura  <tkent@chromium.org>

        Reviewed by NOBODY (OOPS!).

        Add two parameters to WebViewClient::runFileChooser().

         - selected filenames

         - accept attribute value

        https://bugs.webkit.org/show_bug.cgi?id=32473

        * public/WebViewClient.h:

        (WebKit::WebViewClient::runFileChooser):

        * src/ChromeClientImpl.cpp:

        (WebKit::ChromeClientImpl::runOpenPanel):

2009-12-11  Nate Chapin  <japhet@chromium.org>

        Reviewed by Darin Fisher.

WebKit/chromium/public/WebViewClient.h

@@public:

    // dialog is closed, it should call the WebFileChooserCompletion to

    // pass the results of the dialog. Returns false if

    // WebFileChooseCompletion will never be called.

    // If |multiSelect| is true, the dialog allows to select multiple

    // files.

    // |initialValue| is a filename which the dialog should select by

    // default. It can be an empty string.

    // |selectedFiles| has filenames which a file upload control

    // already select. A WebViewClient implementation may ask a user

    // to select removing a file from the selected files, appending

    // other files, or replacing with other files before opening the dialog.

    // |acceptTypes| has a comma-separated MIME types such as

    // "audio/*,text/plain". The dialog may restrict selectable files

    // to the specified types. This value comes from an 'accept'

    // attribute value of an INPUT element. So it might has a wrong

    // formatted string.

164177 virtual bool runFileChooser(

165178 bool multiSelect, const WebString& title,

166 const WebString& initialValue, WebFileChooserCompletion*) { return false; }

        const WebString& initialValue,

        const WebVector<WebString>& selectedFiles, const WebString& acceptTypes,

        WebFileChooserCompletion*) { return false; }

    // Displays a modal alert dialog containing the given message.  Returns

    // once the user dismisses the dialog.

WebKit/chromium/src/ChromeClientImpl.cpp

@@void ChromeClientImpl::runOpenPanel(Frame* frame, PassRefPtr<FileChooser> fileCh

        return;

    bool multipleFiles = fileChooser->allowsMultipleFiles();

    const Vector<String>& selectedFiles = fileChooser->filenames();

    WebVector<WebString> webSelectedFiles(selectedFiles);

    WebString acceptTypes(fileChooser->acceptTypes());

564567

565568 WebString suggestion;

566 if (file~~Chooser->filenames()~~.size() > 0)

567 suggestion = file~~Chooser->filenames()~~[0];

569 if (selectedFiles.size() > 0)

570 suggestion = selectedFiles[0];

    WebFileChooserCompletionImpl* chooserCompletion =

        new WebFileChooserCompletionImpl(fileChooser);

    bool ok = client->runFileChooser(multipleFiles,

                                     WebString(),

                                     suggestion,

577 webSelectedFiles,

578 acceptTypes,

                                     chooserCompletion);

    if (!ok) {

        // Choosing failed, so do callback with an empty list.