Summary: | [Qt][WK2] Support multi-file upload | ||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Dinu Jacob <dinu.jacob> | ||||||||||||||||||
Component: | WebKit2 | Assignee: | Nobody <webkit-unassigned> | ||||||||||||||||||
Status: | RESOLVED FIXED | ||||||||||||||||||||
Severity: | Normal | CC: | ahf, menard, webkit.review.bot, zoltan | ||||||||||||||||||
Priority: | P2 | ||||||||||||||||||||
Version: | 528+ (Nightly build) | ||||||||||||||||||||
Hardware: | Unspecified | ||||||||||||||||||||
OS: | Unspecified | ||||||||||||||||||||
Attachments: |
|
Description
Dinu Jacob
2012-03-19 16:30:36 PDT
Created attachment 132715 [details]
Patch
CC'ing Alex, this might require coordination due to his work on cleaning up the dialog code. Comment on attachment 132715 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=132715&action=review r=me, but please fix the conversion before landing > Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:384 > + if (!dialogRunner.initForFilePicker(filePicker, q, selectedFileNames, type)) Hmm, initForFilePicker's last argument is a boolean, but type is an enum. It sounds like that conversion should be a bit more explicit, because like this it's not very readable. Created attachment 133843 [details]
Patch
Comment on attachment 133843 [details] Patch Rejecting attachment 133843 [details] from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: webkit-commit-queue/ Error: the Git diff contains a binary file without the binary data in line: "Binary files /dev/null and b/Tools/MiniBrowser/qt/icons/checkbox_checked.png differ". Be sure to use the --binary flag when invoking "git diff" with diffs containing binary files. at /mnt/git/webkit-commit-queue/Tools/Scripts/VCSUtils.pm line 690, <ARGV> line 369. Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force']" exit_code: 9 cwd: /mnt/git/webkit-commit-queue/ Full output: http://queues.webkit.org/results/12131964 Created attachment 133847 [details]
Patch
I am fine with this change. I just got sidetracked by something else, so we can just get this in and I will rebase my patch before uploading it for review :-) Comment on attachment 133847 [details] Patch Rejecting attachment 133847 [details] from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: 1 hunk FAILED -- saving rejects to file Source/WebKit2/UIProcess/qt/QtDialogRunner.h.rej patching file Tools/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Tools/MiniBrowser/qt/MiniBrowser.qrc patching file Tools/MiniBrowser/qt/js/MultiSelect.js patching file Tools/MiniBrowser/qt/qml/CheckBox.qml patching file Tools/MiniBrowser/qt/qml/FilePicker.qml Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force']" exit_code: 1 cwd: /mnt/git/webkit-commit-queue/ Full output: http://queues.webkit.org/results/12132900 Created attachment 133863 [details]
Re-based patch
Created attachment 133864 [details]
Re-based patch
Created attachment 133865 [details]
Patch
Comment on attachment 133865 [details] Patch Attachment 133865 [details] did not pass win-ews (win): Output: http://queues.webkit.org/results/12133969 Created attachment 133876 [details]
Patch again
Comment on attachment 133876 [details] Patch again View in context: https://bugs.webkit.org/attachment.cgi?id=133876&action=review > Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:371 > + if (!dialogRunner.initForFilePicker(filePicker, q, selectedFileNames, (bool)type)) I don't think that was what Simon meant by being more explicit. I suggest you change it to something like: if (!dialogRunner.initForFilePicker(filePicker, q, selectedFileNames, type == QtWebPageUIClient::Whatever)) (In reply to comment #14) > (From update of attachment 133876 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=133876&action=review > > > Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp:371 > > + if (!dialogRunner.initForFilePicker(filePicker, q, selectedFileNames, (bool)type)) > > I don't think that was what Simon meant by being more explicit. I suggest you change it to something like: > > if (!dialogRunner.initForFilePicker(filePicker, q, selectedFileNames, type == QtWebPageUIClient::Whatever)) Sure I can make it an explicit boolean value like that. Created attachment 133888 [details]
Patch
Comment on attachment 133888 [details] Patch Clearing flags on attachment: 133888 Committed r112195: <http://trac.webkit.org/changeset/112195> All reviewed patches have been landed. Closing bug. |