63222 2011-06-22 19:30:54 -0700 Add a helper function to FileList to retrieve a list of filenames. 2011-06-24 20:55:29 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 62069 1 dglazkov dglazkov ap tkent webkit.review.bot oldest_to_newest 425893 0 dglazkov 2011-06-22 19:30:54 -0700 Add a helper function to FileList to retrieve a list of filenames. 425895 1 98297 dglazkov 2011-06-22 19:32:17 -0700 Created attachment 98297 Patch 425898 2 98297 tkent 2011-06-22 19:37:09 -0700 Comment on attachment 98297 Patch ok 425914 3 98297 webkit.review.bot 2011-06-22 20:08:11 -0700 Comment on attachment 98297 Patch Clearing flags on attachment: 98297 Committed r89523: <http://trac.webkit.org/changeset/89523> 425915 4 webkit.review.bot 2011-06-22 20:08:15 -0700 All reviewed patches have been landed. Closing bug. 426003 5 ap 2011-06-23 00:58:57 -0700 +Vector<String> FileList::filenames() const +{ + Vector<String> filenames; + for (unsigned i = 0; i < m_files.size(); ++i) + filenames.append(m_files[i]->path()); This function returns paths, so why is it called "filenames()"? 426128 6 dglazkov 2011-06-23 06:55:10 -0700 (In reply to comment #5) > +Vector<String> FileList::filenames() const > +{ > + Vector<String> filenames; > + for (unsigned i = 0; i < m_files.size(); ++i) > + filenames.append(m_files[i]->path()); > > This function returns paths, so why is it called "filenames()"? Oh, that's interesting. It seems there's a schism in how FileList is used in HTMLInputElement vs. File API. The File instances are populated from FileChoooser (http://codesearch.google.com/codesearch#OAMlx_jo-ck/src/third_party/WebKit/Source/WebCore/rendering/RenderFileUploadControl.cpp&l=91), where they are definitely filenames. Then they are briefly called paths (http://codesearch.google.com/codesearch#OAMlx_jo-ck/src/third_party/WebKit/Source/WebCore/html/FileInputType.cpp&l=191), while remaining to be filenames. It seems that either File objects are not semantically well-formed, or I am totally misunderstanding the meaning of word "path". 426243 7 ap 2011-06-23 10:00:26 -0700 And there's also fakepath (see bug 29000). Would be nice to clean this up. 426297 8 dglazkov 2011-06-23 10:50:38 -0700 (In reply to comment #7) > And there's also fakepath (see bug 29000). > > Would be nice to clean this up. One thing we could do is just get rid of FileList altogether for managing input[type=file]. I don't think there's an actual need for that. WDYT? 426302 9 ap 2011-06-23 10:55:47 -0700 > WDYT? I don't have anything wise to say :-) 427298 10 dglazkov 2011-06-24 20:55:29 -0700 (In reply to comment #9) > > WDYT? > > I don't have anything wise to say :-) I looked at it and turns out there are good reasons for input->files() to be a FileList*. I'll just rename filenames to paths in FileList. 98297 2011-06-22 19:32:17 -0700 2011-06-22 20:08:11 -0700 Patch bug-63222-20110622193216.patch text/plain 4298 dglazkov U3VidmVyc2lvbiBSZXZpc2lvbjogODk0NDcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBmMGRmNjdmMGEwZTE5MjAw ZDE3MGEyZThjYTliYWUzZGJlMWIwN2NlLi5mMGQ2NTc3YjJjN2NkMTU0Y2Q4NjdjNzMyOTE3ZTVj N2Y0Y2QwODlhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDYtMjIgIERpbWl0 cmkgR2xhemtvdiAgPGRnbGF6a292QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYSBoZWxwZXIgZnVuY3Rpb24gdG8gRmls ZUxpc3QgdG8gcmV0cmlldmUgYSBsaXN0IG9mIGZpbGVuYW1lcy4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYzMjIyCisKKyAgICAgICAgUmVmYWN0b3Jp bmcsIGNvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBmaWxlYXBpL0ZpbGVM aXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZpbGVMaXN0OjpmaWxlbmFtZXMpOiBBZGRlZC4K KyAgICAgICAgKiBmaWxlYXBpL0ZpbGVMaXN0Lmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ckZpbGVVcGxvYWRDb250cm9sLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZpbGVVcGxv YWRDb250cm9sOjpSZW5kZXJGaWxlVXBsb2FkQ29udHJvbCk6IENoYW5nZWQgdG8gdXNlIG5ld2x5 IGFkZGVkIGhlbHBlci4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZpbGVVcGxvYWRDb250cm9s OjpjbGljayk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmlsZVVwbG9hZENvbnRy b2w6OmZpbGVUZXh0VmFsdWUpOiBEaXR0by4KKwogMjAxMS0wNi0yMiAgRXVubWkgTGVlICA8ZXVu bWkxNS5sZWVAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTWFydGluIFJvYmlu c29uLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZmlsZWFwaS9GaWxlTGlzdC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9maWxlYXBpL0ZpbGVMaXN0LmNwcAppbmRleCBiYTgxMDg3NDgwNmRjMmFi ZmEzNzRiZDkzNmI2NjExZTA4ODRlMTI0Li4xNGUxNzI3ZjM5OTVlNDUxOWRlNmVjNzFhZjBmZWE5 ODZhZTQxMDkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9maWxlYXBpL0ZpbGVMaXN0LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9maWxlYXBpL0ZpbGVMaXN0LmNwcApAQCAtNDEsNCArNDEs MTMgQEAgRmlsZSogRmlsZUxpc3Q6Oml0ZW0odW5zaWduZWQgaW5kZXgpIGNvbnN0CiAgICAgcmV0 dXJuIG1fZmlsZXNbaW5kZXhdLmdldCgpOwogfQogCitWZWN0b3I8U3RyaW5nPiBGaWxlTGlzdDo6 ZmlsZW5hbWVzKCkgY29uc3QKK3sKKyAgICBWZWN0b3I8U3RyaW5nPiBmaWxlbmFtZXM7CisgICAg Zm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IG1fZmlsZXMuc2l6ZSgpOyArK2kpCisgICAgICAgIGZp bGVuYW1lcy5hcHBlbmQobV9maWxlc1tpXS0+cGF0aCgpKTsKKworICAgIHJldHVybiBmaWxlbmFt ZXM7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2ZpbGVhcGkvRmlsZUxpc3QuaCBiL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvRmlsZUxpc3Qu aAppbmRleCBlMDc4MTkxZmMxYmY5ZDlhY2ZkMGYzNDNjODhmZGZiZDVlZTg4ZjZjLi43NzIzNjgy ZjdkNmMwNGU3ZGY1M2MxYTYyZGM1ZGYwNjhkZWQ3YWNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9maWxlYXBpL0ZpbGVMaXN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZmlsZWFwaS9GaWxl TGlzdC5oCkBAIC00Nyw2ICs0Nyw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgYm9v bCBpc0VtcHR5KCkgY29uc3QgeyByZXR1cm4gbV9maWxlcy5pc0VtcHR5KCk7IH0KICAgICAgICAg dm9pZCBjbGVhcigpIHsgbV9maWxlcy5jbGVhcigpOyB9CiAgICAgICAgIHZvaWQgYXBwZW5kKFBh c3NSZWZQdHI8RmlsZT4gZmlsZSkgeyBtX2ZpbGVzLmFwcGVuZChmaWxlKTsgfQorICAgICAgICBW ZWN0b3I8U3RyaW5nPiBmaWxlbmFtZXMoKSBjb25zdDsKIAogICAgIHByaXZhdGU6CiAgICAgICAg IEZpbGVMaXN0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy RmlsZVVwbG9hZENvbnRyb2wuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZp bGVVcGxvYWRDb250cm9sLmNwcAppbmRleCA1NjRiNWQyZGM1MDdmMTVlMjc2ZjgzMTc3NzA2MmVi OTYwMzUzNzk0Li5iMjJhYjc1MjdlYzljY2MwZTVmNWM2YzlmMTNlYjBlYWY4YmYyODcwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmlsZVVwbG9hZENvbnRyb2wu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGaWxlVXBsb2FkQ29udHJv bC5jcHAKQEAgLTU0LDIwICs1NCwxMiBAQCBjb25zdCBpbnQgaWNvbkZpbGVuYW1lU3BhY2luZyA9 IDI7CiBjb25zdCBpbnQgZGVmYXVsdFdpZHRoTnVtQ2hhcnMgPSAzNDsKIGNvbnN0IGludCBidXR0 b25TaGFkb3dIZWlnaHQgPSAyOwogCi1zdGF0aWMgdm9pZCBmaWxlbmFtZXNGcm9tRmlsZUxpc3Qo Y29uc3QgRmlsZUxpc3QqIGxpc3QsIFZlY3RvcjxTdHJpbmc+JiBmaWxlbmFtZXMpCi17Ci0gICAg dW5zaWduZWQgbGVuZ3RoID0gbGlzdCA/IGxpc3QtPmxlbmd0aCgpIDogMDsKLSAgICBmb3IgKHVu c2lnbmVkIGkgPSAwOyBpIDwgbGVuZ3RoOyArK2kpCi0gICAgICAgIGZpbGVuYW1lcy5hcHBlbmQo bGlzdC0+aXRlbShpKS0+cGF0aCgpKTsKLX0KLQogUmVuZGVyRmlsZVVwbG9hZENvbnRyb2w6OlJl bmRlckZpbGVVcGxvYWRDb250cm9sKEhUTUxJbnB1dEVsZW1lbnQqIGlucHV0KQogICAgIDogUmVu ZGVyQmxvY2soaW5wdXQpCiAgICAgLCBtX2ljb25Mb2FkZXIoRmlsZUljb25Mb2FkZXI6OmNyZWF0 ZSh0aGlzKSkKIHsKLSAgICBWZWN0b3I8U3RyaW5nPiBmaWxlbmFtZXM7Ci0gICAgZmlsZW5hbWVz RnJvbUZpbGVMaXN0KGlucHV0LT5maWxlcygpLCBmaWxlbmFtZXMpOwotICAgIHJlcXVlc3RJY29u KGZpbGVuYW1lcyk7CisgICAgQVNTRVJUKGlucHV0LT5maWxlcygpKTsKKyAgICByZXF1ZXN0SWNv bihpbnB1dC0+ZmlsZXMoKS0+ZmlsZW5hbWVzKCkpOwogfQogCiBSZW5kZXJGaWxlVXBsb2FkQ29u dHJvbDo6flJlbmRlckZpbGVVcGxvYWRDb250cm9sKCkKQEAgLTEzMyw3ICsxMjUsOCBAQCB2b2lk IFJlbmRlckZpbGVVcGxvYWRDb250cm9sOjpjbGljaygpCiAgICAgICAgIHNldHRpbmdzLmFsbG93 c011bHRpcGxlRmlsZXMgPSBpbnB1dC0+ZmFzdEhhc0F0dHJpYnV0ZShtdWx0aXBsZUF0dHIpOwog I2VuZGlmCiAgICAgICAgIHNldHRpbmdzLmFjY2VwdFR5cGVzID0gaW5wdXQtPmFjY2VwdCgpOwot ICAgICAgICBmaWxlbmFtZXNGcm9tRmlsZUxpc3QoaW5wdXQtPmZpbGVzKCksIHNldHRpbmdzLnNl bGVjdGVkRmlsZXMpOworICAgICAgICBBU1NFUlQoaW5wdXQtPmZpbGVzKCkpOworICAgICAgICBz ZXR0aW5ncy5zZWxlY3RlZEZpbGVzID0gaW5wdXQtPmZpbGVzKCktPmZpbGVuYW1lcygpOwogICAg ICAgICBjaHJvbWUtPnJ1bk9wZW5QYW5lbChmcmFtZSgpLCBuZXdGaWxlQ2hvb3NlcihzZXR0aW5n cykpOwogICAgIH0KIH0KQEAgLTMyOCw5ICszMjEsOSBAQCBTdHJpbmcgUmVuZGVyRmlsZVVwbG9h ZENvbnRyb2w6OmJ1dHRvblZhbHVlKCkKIAogU3RyaW5nIFJlbmRlckZpbGVVcGxvYWRDb250cm9s OjpmaWxlVGV4dFZhbHVlKCkgY29uc3QKIHsKLSAgICBWZWN0b3I8U3RyaW5nPiBmaWxlbmFtZXM7 Ci0gICAgZmlsZW5hbWVzRnJvbUZpbGVMaXN0KHN0YXRpY19jYXN0PEhUTUxJbnB1dEVsZW1lbnQq Pihub2RlKCkpLT5maWxlcygpLCBmaWxlbmFtZXMpOwotICAgIHJldHVybiB0aGVtZSgpLT5maWxl TGlzdE5hbWVGb3JXaWR0aChmaWxlbmFtZXMsIHN0eWxlKCktPmZvbnQoKSwgbWF4RmlsZW5hbWVX aWR0aCgpKTsKKyAgICBIVE1MSW5wdXRFbGVtZW50KiBpbnB1dCA9IHN0YXRpY19jYXN0PEhUTUxJ bnB1dEVsZW1lbnQqPihub2RlKCkpOworICAgIEFTU0VSVChpbnB1dC0+ZmlsZXMoKSk7CisgICAg cmV0dXJuIHRoZW1lKCktPmZpbGVMaXN0TmFtZUZvcldpZHRoKGlucHV0LT5maWxlcygpLT5maWxl bmFtZXMoKSwgc3R5bGUoKS0+Zm9udCgpLCBtYXhGaWxlbmFtZVdpZHRoKCkpOwogfQogICAgIAog fSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo=