45498 2010-09-09 15:26:14 -0700 [FileSystem] Do not call EntriesCallback more than once if there're no entries. 2010-09-10 11:44:19 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 0 kinuko webkit-unassigned dumi ericu fishd jianli kkanetkar oldest_to_newest 276793 0 kinuko 2010-09-09 15:26:14 -0700 DirectoryReader.readDirectory should not call EntriesCallback twice if there're no entries. Currently it wrongly calls the callback twice (one to return entries that is empty and the other one to indicate there's no more entries.) http://dev.w3.org/2009/dap/file-system/file-dir-sys.html#the-directoryreader-interface 276800 1 67103 kinuko 2010-09-09 15:35:32 -0700 Created attachment 67103 Patch 277038 2 67103 dumi 2010-09-09 23:00:35 -0700 Comment on attachment 67103 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=67103&action=prettypatch r=me, but please address the comments before submitting. > WebCore/fileapi/FileSystemCallbacks.cpp:150 > + if (!hasMore && hadEntries) { i don't think you need the hadEntries variable. can you just use: if (!hasMore && !m_entries->isEmpty()) and clear m_entries after the if-block? > WebCore/fileapi/FileSystemCallbacks.cpp:151 > // If there're no more entries, call back once more with an empty array. update the comment please. 277336 3 kinuko 2010-09-10 11:44:19 -0700 Committed r67220: <http://trac.webkit.org/changeset/67220> 67103 2010-09-09 15:35:32 -0700 2010-09-09 23:00:35 -0700 Patch bug-45498-20100909153530.patch text/plain 2203 kinuko ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg Y2I0MTM4NzI0OWE0M2JjZTNmOTkzY2E4ZDQ1YWEwOGQ1NjM0ZTkwMy4uNWRlMTZiODc1MzhhNzdi MmZiYzI1ZTNjOTc4YzRmOWU5NTNlMzk4OSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wOS0wOSAgS2lu dWtvIFlhc3VkYSAgPGtpbnVrb0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0ZpbGVTeXN0ZW1dIERvIG5vdCBjYWxsIEVudHJp ZXNDYWxsYmFjayBtb3JlIHRoYW4gb25jZSBpZiB0aGVyZSdyZSBubyBlbnRyaWVzLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDU0OTgKKworICAgICAg ICBObyBuZXcgdGVzdHMsIGxheW91dC10ZXN0cyB0aGF0IGNvbmZpcm0gdGhlIGJlaGF2aW9yIHdp bGwgYmUgYWRkZWQgaW4gbGF0ZXIgcGF0Y2hlcy4KKworICAgICAgICAqIGZpbGVhcGkvRmlsZVN5 c3RlbUNhbGxiYWNrcy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFbnRyaWVzQ2FsbGJhY2tzOjpF bnRyaWVzQ2FsbGJhY2tzKToKKyAgICAgICAgKFdlYkNvcmU6OkVudHJpZXNDYWxsYmFja3M6OmRp ZFJlYWREaXJlY3RvcnlFbnRyeSk6CisgICAgICAgIChXZWJDb3JlOjpFbnRyaWVzQ2FsbGJhY2tz OjpkaWRSZWFkRGlyZWN0b3J5RW50cmllcyk6CisKIDIwMTAtMDktMDggIEFuZHkgRXN0ZXMgIDxh ZXN0ZXNAYXBwbGUuY29tPgogCiAgICAgICAgIFJ1YmJlci1zdGFtcGVkIGJ5IERhcmluIEFkbGVy LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9maWxlYXBpL0ZpbGVTeXN0ZW1DYWxsYmFja3MuY3BwIGIv V2ViQ29yZS9maWxlYXBpL0ZpbGVTeXN0ZW1DYWxsYmFja3MuY3BwCmluZGV4IDc0MWRmNzgyYmM2 ZGQ1YzNlZGI5Zjc0ZTQ0ZTgwZjM4MGJjYzlhNzMuLmUyZTEzOGVjZWYwZjA4N2QxMTI0NzVjYTc0 YjZhM2JmZDgwZGU2ZTEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvZmlsZWFwaS9GaWxlU3lzdGVtQ2Fs bGJhY2tzLmNwcAorKysgYi9XZWJDb3JlL2ZpbGVhcGkvRmlsZVN5c3RlbUNhbGxiYWNrcy5jcHAK QEAgLTEyOCwxMyArMTI4LDEyIEBAIEVudHJpZXNDYWxsYmFja3M6OkVudHJpZXNDYWxsYmFja3Mo UGFzc1JlZlB0cjxFbnRyaWVzQ2FsbGJhY2s+IHN1Y2Nlc3NDYWxsYmFjaywKICAgICAsIG1fc3Vj Y2Vzc0NhbGxiYWNrKHN1Y2Nlc3NDYWxsYmFjaykKICAgICAsIG1fZmlsZVN5c3RlbShmaWxlU3lz dGVtKQogICAgICwgbV9iYXNlUGF0aChiYXNlUGF0aCkKKyAgICAsIG1fZW50cmllcyhFbnRyeUFy cmF5OjpjcmVhdGUoKSkKIHsKIH0KIAogdm9pZCBFbnRyaWVzQ2FsbGJhY2tzOjpkaWRSZWFkRGly ZWN0b3J5RW50cnkoY29uc3QgU3RyaW5nJiBuYW1lLCBib29sIGlzRGlyZWN0b3J5KQogewotICAg IGlmICghbV9lbnRyaWVzKQotICAgICAgICBtX2VudHJpZXMgPSBFbnRyeUFycmF5OjpjcmVhdGUo KTsKICAgICBpZiAoaXNEaXJlY3RvcnkpCiAgICAgICAgIG1fZW50cmllcy0+YXBwZW5kKERpcmVj dG9yeUVudHJ5OjpjcmVhdGUobV9maWxlU3lzdGVtLCBET01GaWxlUGF0aDo6YXBwZW5kKG1fYmFz ZVBhdGgsIG5hbWUpKSk7CiAgICAgZWxzZQpAQCAtMTQ2LDggKzE0NSw5IEBAIHZvaWQgRW50cmll c0NhbGxiYWNrczo6ZGlkUmVhZERpcmVjdG9yeUVudHJpZXMoYm9vbCBoYXNNb3JlKQogICAgIEFT U0VSVChtX2VudHJpZXMpOwogICAgIGlmIChtX3N1Y2Nlc3NDYWxsYmFjaykgewogICAgICAgICBt X3N1Y2Nlc3NDYWxsYmFjay0+aGFuZGxlRXZlbnQobV9lbnRyaWVzLmdldCgpKTsKKyAgICAgICAg Ym9vbCBoYWRFbnRyaWVzID0gIW1fZW50cmllcy0+aXNFbXB0eSgpOwogICAgICAgICBtX2VudHJp ZXMtPmNsZWFyKCk7Ci0gICAgICAgIGlmICghaGFzTW9yZSkgeworICAgICAgICBpZiAoIWhhc01v cmUgJiYgaGFkRW50cmllcykgewogICAgICAgICAgICAgLy8gSWYgdGhlcmUncmUgbm8gbW9yZSBl bnRyaWVzLCBjYWxsIGJhY2sgb25jZSBtb3JlIHdpdGggYW4gZW1wdHkgYXJyYXkuCiAgICAgICAg ICAgICBtX3N1Y2Nlc3NDYWxsYmFjay0+aGFuZGxlRXZlbnQobV9lbnRyaWVzLmdldCgpKTsKICAg ICAgICAgICAgIG1fc3VjY2Vzc0NhbGxiYWNrLmNsZWFyKCk7Cg==