55638 2011-03-02 17:43:51 -0800 [fileapi] Tighten up ResolveURICallbacks to retry only on TYPE_MISMATCH_ERR and call DirectoryEntry instead of DOMFileSystem methods 2011-03-03 20:26:00 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 0 adamk webkit-unassigned abarth commit-queue jorlow kinuko levin oldest_to_newest 361254 0 adamk 2011-03-02 17:43:51 -0800 [fileapi] Tighten up ResolveURICallbacks to retry only on TYPE_MISMATCH_ERR and call DirectoryEntry instead of DOMFileSystem methods 361259 1 84499 adamk 2011-03-02 17:45:37 -0800 Created attachment 84499 Patch 361269 2 84499 kinuko 2011-03-02 17:59:46 -0800 Comment on attachment 84499 Patch lgtm. 361856 3 adamk 2011-03-03 12:57:23 -0800 CCing some possible reviewers. 362222 4 84499 commit-queue 2011-03-03 20:25:54 -0800 Comment on attachment 84499 Patch Clearing flags on attachment: 84499 Committed r80313: <http://trac.webkit.org/changeset/80313> 362223 5 commit-queue 2011-03-03 20:26:00 -0800 All reviewed patches have been landed. Closing bug. 84499 2011-03-02 17:45:37 -0800 2011-03-03 20:25:54 -0800 Patch bug-55638-20110302174536.patch text/plain 4324 adamk U3VidmVyc2lvbiBSZXZpc2lvbjogODAxODcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhODM5MGE5NDU2NjIyM2Yy NjQ0NDFmMzZmYmU4ZWY2M2I2OTAwNjQ0Li4xZWNlYmVjNmQ4ZWNkMjJhYzFjM2ZiNjlhNGM0ODU3 YjMxZWZhMTU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDMtMDIgIEFkYW0g S2xlaW4gIDxhZGFta0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgW2ZpbGVhcGldIFRpZ2h0ZW4gdXAgUmVzb2x2ZVVSSUNhbGxi YWNrcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTU2 MzgKKworICAgICAgICBUd28gY2hhbmdlczoKKyAgICAgICAgICAtIFJldHJ5IG9ubHkgb24gVFlQ RV9NSVNNQVRDSF9FUlIgbm93IHRoYXQgQ2hyb21pdW0KKyAgICAgICAgICAgIHByb3Blcmx5IHNl dHMgdGhhdCBlcnJvciBjb2RlLgorICAgICAgICAgIC0gQ2FsbCBEaXJlY3RvcnlFbnRyeSBpbnN0 ZWFkIG9mIERPTUZpbGVTeXN0ZW0gbWV0aG9kcy4KKworICAgICAgICBObyBjaGFuZ2UgaW4gYmVo YXZpb3IsIHNvIG5vIG5ldyB0ZXN0cy4KKworICAgICAgICAqIGZpbGVhcGkvRmlsZVN5c3RlbUNh bGxiYWNrcy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvbHZlVVJJQ2FsbGJhY2tzOjpkaWRP cGVuRmlsZVN5c3RlbSk6CisKIDIwMTEtMDMtMDIgIERhbmllbCBDaGVuZyAgPGRjaGVuZ0BjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9maWxlYXBpL0ZpbGVTeXN0ZW1DYWxsYmFja3MuY3BwIGIvU291cmNl L1dlYkNvcmUvZmlsZWFwaS9GaWxlU3lzdGVtQ2FsbGJhY2tzLmNwcAppbmRleCAxZjhiNGUxZTY5 YmZmOTJmOTY1MGEwNmE3N2NkMmE2MDA0ZjJkYzI5Li42OWZhNTNhMzE2YjcwZGE3M2RjOTNiMzEx YTZmNjdlNjRkMjAwMzRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9maWxlYXBpL0ZpbGVT eXN0ZW1DYWxsYmFja3MuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvRmlsZVN5c3Rl bUNhbGxiYWNrcy5jcHAKQEAgLTE5OCwzNCArMTk4LDM0IEBAIG5hbWVzcGFjZSB7CiAKIGNsYXNz IEVycm9yQ2FsbGJhY2tXcmFwcGVyIDogcHVibGljIEVycm9yQ2FsbGJhY2sgewogcHVibGljOgot ICAgIHN0YXRpYyBQYXNzUmVmUHRyPEVycm9yQ2FsbGJhY2tXcmFwcGVyPiBjcmVhdGUoUGFzc1Jl ZlB0cjxET01GaWxlU3lzdGVtPiBmaWxlU3lzdGVtLCBQYXNzUmVmUHRyPEVudHJ5Q2FsbGJhY2s+ IHN1Y2Nlc3NDYWxsYmFjaywgUGFzc1JlZlB0cjxFcnJvckNhbGxiYWNrPiBlcnJvckNhbGxiYWNr LCBjb25zdCBTdHJpbmcmIGZpbGVQYXRoKQorICAgIHN0YXRpYyBQYXNzUmVmUHRyPEVycm9yQ2Fs bGJhY2tXcmFwcGVyPiBjcmVhdGUoUGFzc1JlZlB0cjxFbnRyeUNhbGxiYWNrPiBzdWNjZXNzQ2Fs bGJhY2ssIFBhc3NSZWZQdHI8RXJyb3JDYWxsYmFjaz4gZXJyb3JDYWxsYmFjaywgUGFzc1JlZlB0 cjxEaXJlY3RvcnlFbnRyeT4gcm9vdCwgY29uc3QgU3RyaW5nJiBmaWxlUGF0aCkKICAgICB7Ci0g ICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgRXJyb3JDYWxsYmFja1dyYXBwZXIoZmlsZVN5c3Rl bSwgc3VjY2Vzc0NhbGxiYWNrLCBlcnJvckNhbGxiYWNrLCBmaWxlUGF0aCkpOworICAgICAgICBy ZXR1cm4gYWRvcHRSZWYobmV3IEVycm9yQ2FsbGJhY2tXcmFwcGVyKHN1Y2Nlc3NDYWxsYmFjaywg ZXJyb3JDYWxsYmFjaywgcm9vdCwgZmlsZVBhdGgpKTsKICAgICB9CiAKICAgICB2aXJ0dWFsIGJv b2wgaGFuZGxlRXZlbnQoRmlsZUVycm9yKiBlcnJvcikKICAgICB7CiAgICAgICAgIEFTU0VSVChl cnJvcik7Ci0gICAgICAgIC8vIEZJWE1FOiBPbmx5IGNoZWNrIGZvciBUWVBFX01JU01BVENIX0VS UiBvbmNlIENocm9taXVtIGlzIGZpeGVkIHRvIHJldHVybiB0aGF0IGFzIHJlcXVpcmVkIGJ5IHRo ZSBzcGVjLgotICAgICAgICBpZiAoZXJyb3ItPmNvZGUoKSA9PSBGaWxlRXJyb3I6OlRZUEVfTUlT TUFUQ0hfRVJSIHx8IGVycm9yLT5jb2RlKCkgPT0gRmlsZUVycm9yOjpJTlZBTElEX1NUQVRFX0VS UikKLSAgICAgICAgICAgIG1fZmlsZVN5c3RlbS0+Z2V0RmlsZShtX2ZpbGVTeXN0ZW0tPnJvb3Qo KS5nZXQoKSwgbV9maWxlUGF0aCwgMCwgbV9zdWNjZXNzQ2FsbGJhY2ssIG1fZXJyb3JDYWxsYmFj ayk7CisgICAgICAgIGlmIChlcnJvci0+Y29kZSgpID09IEZpbGVFcnJvcjo6VFlQRV9NSVNNQVRD SF9FUlIpCisgICAgICAgICAgICBtX3Jvb3QtPmdldEZpbGUobV9maWxlUGF0aCwgMCwgbV9zdWNj ZXNzQ2FsbGJhY2ssIG1fZXJyb3JDYWxsYmFjayk7CiAgICAgICAgIGVsc2UgaWYgKG1fZXJyb3JD YWxsYmFjaykKICAgICAgICAgICAgIG1fZXJyb3JDYWxsYmFjay0+aGFuZGxlRXZlbnQoZXJyb3Ip OwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9CiAKIHByaXZhdGU6Ci0gICAgRXJyb3JDYWxs YmFja1dyYXBwZXIoUGFzc1JlZlB0cjxET01GaWxlU3lzdGVtPiBmaWxlU3lzdGVtLCBQYXNzUmVm UHRyPEVudHJ5Q2FsbGJhY2s+IHN1Y2Nlc3NDYWxsYmFjaywgUGFzc1JlZlB0cjxFcnJvckNhbGxi YWNrPiBlcnJvckNhbGxiYWNrLCBjb25zdCBTdHJpbmcmIGZpbGVQYXRoKQotICAgICAgICA6IG1f ZmlsZVN5c3RlbShmaWxlU3lzdGVtKQotICAgICAgICAsIG1fc3VjY2Vzc0NhbGxiYWNrKHN1Y2Nl c3NDYWxsYmFjaykKKyAgICBFcnJvckNhbGxiYWNrV3JhcHBlcihQYXNzUmVmUHRyPEVudHJ5Q2Fs bGJhY2s+IHN1Y2Nlc3NDYWxsYmFjaywgUGFzc1JlZlB0cjxFcnJvckNhbGxiYWNrPiBlcnJvckNh bGxiYWNrLCBQYXNzUmVmUHRyPERpcmVjdG9yeUVudHJ5PiByb290LCBjb25zdCBTdHJpbmcmIGZp bGVQYXRoKQorICAgICAgICA6IG1fc3VjY2Vzc0NhbGxiYWNrKHN1Y2Nlc3NDYWxsYmFjaykKICAg ICAgICAgLCBtX2Vycm9yQ2FsbGJhY2soZXJyb3JDYWxsYmFjaykKKyAgICAgICAgLCBtX3Jvb3Qo cm9vdCkKICAgICAgICAgLCBtX2ZpbGVQYXRoKGZpbGVQYXRoKQogICAgIHsKKyAgICAgICAgQVNT RVJUKG1fcm9vdCk7CiAgICAgfQogCi0gICAgUmVmUHRyPERPTUZpbGVTeXN0ZW0+IG1fZmlsZVN5 c3RlbTsKICAgICBSZWZQdHI8RW50cnlDYWxsYmFjaz4gbV9zdWNjZXNzQ2FsbGJhY2s7CiAgICAg UmVmUHRyPEVycm9yQ2FsbGJhY2s+IG1fZXJyb3JDYWxsYmFjazsKKyAgICBSZWZQdHI8RGlyZWN0 b3J5RW50cnk+IG1fcm9vdDsKICAgICBTdHJpbmcgbV9maWxlUGF0aDsKIH07CiAKQEAgLTI0Nyw4 ICsyNDcsOCBAQCBSZXNvbHZlVVJJQ2FsbGJhY2tzOjpSZXNvbHZlVVJJQ2FsbGJhY2tzKFBhc3NS ZWZQdHI8RW50cnlDYWxsYmFjaz4gc3VjY2Vzc0NhbGxiYQogdm9pZCBSZXNvbHZlVVJJQ2FsbGJh Y2tzOjpkaWRPcGVuRmlsZVN5c3RlbShjb25zdCBTdHJpbmcmIG5hbWUsIFBhc3NPd25QdHI8QXN5 bmNGaWxlU3lzdGVtPiBhc3luY0ZpbGVTeXN0ZW0pCiB7CiAgICAgQVNTRVJUKGFzeW5jRmlsZVN5 c3RlbSk7Ci0gICAgUmVmUHRyPERPTUZpbGVTeXN0ZW0+IGZpbGVTeXN0ZW0gPSBET01GaWxlU3lz dGVtOjpjcmVhdGUobV9zY3JpcHRFeGVjdXRpb25Db250ZXh0LmdldCgpLCBuYW1lLCBhc3luY0Zp bGVTeXN0ZW0ubGVha1B0cigpKTsKLSAgICBmaWxlU3lzdGVtLT5nZXREaXJlY3RvcnkoZmlsZVN5 c3RlbS0+cm9vdCgpLmdldCgpLCBtX2ZpbGVQYXRoLCAwLCBtX3N1Y2Nlc3NDYWxsYmFjaywgRXJy b3JDYWxsYmFja1dyYXBwZXI6OmNyZWF0ZShmaWxlU3lzdGVtLCBtX3N1Y2Nlc3NDYWxsYmFjaywg bV9lcnJvckNhbGxiYWNrLCBtX2ZpbGVQYXRoKSk7CisgICAgUmVmUHRyPERpcmVjdG9yeUVudHJ5 PiByb290ID0gRE9NRmlsZVN5c3RlbTo6Y3JlYXRlKG1fc2NyaXB0RXhlY3V0aW9uQ29udGV4dC5n ZXQoKSwgbmFtZSwgYXN5bmNGaWxlU3lzdGVtLmxlYWtQdHIoKSktPnJvb3QoKTsKKyAgICByb290 LT5nZXREaXJlY3RvcnkobV9maWxlUGF0aCwgMCwgbV9zdWNjZXNzQ2FsbGJhY2ssIEVycm9yQ2Fs bGJhY2tXcmFwcGVyOjpjcmVhdGUobV9zdWNjZXNzQ2FsbGJhY2ssIG1fZXJyb3JDYWxsYmFjaywg cm9vdCwgbV9maWxlUGF0aCkpOwogfQogCiAvLyBNZXRhZGF0YUNhbGxiYWNrcyAtLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCg==