[Chromium] Add 2 parameters to WebViewClient::runFileChooser()

• Component: WebKit API
• Status: RESOLVED FIXED

[Kent Tamura]

We had better add parameters to WebViewClient::runFileChooser() in order to improve multi-selected file upload control UI and support for HTML5's accept attribute.

[Kent Tamura]

Created attachment 44740 [details]
Proposed patch

The patch should not be committed before http://codereview.chromium.org/497001 is committed.

[WebKit Review Bot]

style-queue ran check-webkit-style on attachment 44740 [details] without any errors.

[Eric Seidel (no email)]

I think Darin Fisher or Dimitri Glazkov are your peeps here.

[Darin Fisher (:fishd, Google)]

Comment on attachment 44740 [details]
Proposed patch

> +++ b/WebKit/chromium/public/WebViewClient.h
...
>      virtual bool runFileChooser(
>          bool multiSelect, const WebString& title,
> -        const WebString& initialValue, WebFileChooserCompletion*) { return false; }
> +        const WebString& initialValue,
> +        const WebVector<WebString>& selectedFiles, const WebString& acceptTypes,
> +        WebFileChooserCompletion*) { return false; }

Instead of dumping more parameters on this function, I think we should
create a WebFileChooserParams structure (much like WebPluginParams).

This way it'll be easier to add additional parameters in the future, and
we can document the parameters in WebFileChooserParams.h instead of here
in WebViewClient.h (which should improve readability a bit).

To avoid the issue of breaking the chromium build, please preserve the old
WebViewClient::runFileChooser method temporarily.  Add a comment to declare
that that old method is deprecated.

You can even use the return value of runFileChooser to failover to the old
deprecated method if the new method returns false.  Then, once the chromium
side picks up this new version of WebKit, you should go back and remove the
deprecated function.  This way there is no burden on the chromium tree sheriffs.

[Kent Tamura]

Created attachment 46541 [details]
Proposed patch (rev.2)

[Kent Tamura]

Thank you for reviewing.

(In reply to comment #4)
> Instead of dumping more parameters on this function, I think we should
> create a WebFileChooserParams structure (much like WebPluginParams).

Ok, I introduced WebFileChooserParams in the updated patch.

> You can even use the return value of runFileChooser to failover to the old
> deprecated method if the new method returns false.  Then, once the chromium
> side picks up this new version of WebKit, you should go back and remove the
> deprecated function.  This way there is no burden on the chromium tree
> sheriffs.

That's good idea.  I updated the code so.

[WebKit Review Bot]

Attachment 46541 [details] did not pass style-queue:

Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1
WebKit/chromium/public/WebFileChooserParams.h:35:  Alphabetical sorting problem.  [build/include_order] [4]
Total errors found: 1

[Kent Tamura]

Created attachment 46542 [details]
Proposed patch (rev.3)

[Darin Fisher (:fishd, Google)]

Comment on attachment 46542 [details]
Proposed patch (rev.3)

> +++ b/WebKit/chromium/public/WebFileChooserParams.h
...
> +struct WebFileChooserParams {
...
> +    WebFileChooserCompletion* chooserCompletion;

I'm sorry for not mentioning this earlier, but I think that this
member should not be part of this structure since it is not a
parameter that effects the way the dialog is rendered.  It is
conceptually separate from those parameters since it is just
a mechanism for indicating completion of the runFileChooser call.

Sorry to add another round to this patch, but I think this would
be a good change to make.


> +++ b/WebKit/chromium/src/ChromeClientImpl.cpp
...
> +    WebFileChooserParams params;
> +    params.multiSelect = fileChooser->allowsMultipleFiles();
> +    params.acceptTypes = fileChooser->acceptTypes();
> +    const Vector<String>& selectedFiles = fileChooser->filenames();
> +    params.selectedFiles = WebVector<WebString>(selectedFiles);

you should be able to write:

       params.selectedFiles = fileChooser->filenames();

does that not work for you?

[Kent Tamura]

Created attachment 46545 [details]
Proposed patch (rev.4)

[Kent Tamura]

> > +struct WebFileChooserParams {
> ...
> > +    WebFileChooserCompletion* chooserCompletion;
> 
> I'm sorry for not mentioning this earlier, but I think that this
> member should not be part of this structure since it is not a
> parameter that effects the way the dialog is rendered.  It is
> conceptually separate from those parameters since it is just
> a mechanism for indicating completion of the runFileChooser call.

ok, done.

> > +    const Vector<String>& selectedFiles = fileChooser->filenames();
> > +    params.selectedFiles = WebVector<WebString>(selectedFiles);
> 
> you should be able to write:
> 
>        params.selectedFiles = fileChooser->filenames();
> 
> does that not work for you?

It works.  Fixed.
Probably I had a reason in the last year though I can't remember it :-)

[WebKit Commit Bot]

Comment on attachment 46545 [details]
Proposed patch (rev.4)

Clearing flags on attachment: 46545

Committed r53269: <http://trac.webkit.org/changeset/53269>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.