77881 2012-02-06 09:57:35 -0800 [filesystem/Chromium] crackFileSystemURL needs to use innerURL 2012-02-06 14:59:32 -0800 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 ericu ericu abarth kinuko oldest_to_newest 550075 0 ericu 2012-02-06 09:57:35 -0800 We need to update AsyncFileSystemChromium::crackFileSystemURL to use innerURL if it's present. Once http://codereview.chromium.org/7811006 lands, it always will, and we can remove the old code. Patch to follow shortly. 550128 1 125675 ericu 2012-02-06 11:22:50 -0800 Created attachment 125675 Patch 550232 2 125675 abarth 2012-02-06 13:10:51 -0800 Comment on attachment 125675 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=125675&action=review > Source/WebKit/chromium/src/AsyncFileSystemChromium.cpp:67 > + String typeString = url.innerURL()->path().substring(1); There's probably a way to do this that saves some mallocs. If this is performance-sensitive code, we might want to investigate further. 550233 3 125675 abarth 2012-02-06 13:11:13 -0800 Comment on attachment 125675 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=125675&action=review > Source/WebKit/chromium/src/AsyncFileSystemChromium.cpp:77 > + filePath = decodeURLEscapeSequences(url.path()); Not the innerURLs path? 550236 4 125675 ericu 2012-02-06 13:14:05 -0800 Comment on attachment 125675 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=125675&action=review >> Source/WebKit/chromium/src/AsyncFileSystemChromium.cpp:67 >> + String typeString = url.innerURL()->path().substring(1); > > There's probably a way to do this that saves some mallocs. If this is performance-sensitive code, we might want to investigate further. I don't expect it to be worth optimizing; certainly not right now. >> Source/WebKit/chromium/src/AsyncFileSystemChromium.cpp:77 >> + filePath = decodeURLEscapeSequences(url.path()); > > Not the innerURLs path? Nope; the innerURL's path tells us which storage area ["/temporary" or "/persistent"], and the outer URL gets the virtual path. 550319 5 ericu 2012-02-06 14:59:32 -0800 Committed r106856: <http://trac.webkit.org/changeset/106856> 125675 2012-02-06 11:22:50 -0800 2012-02-06 13:14:05 -0800 Patch bug-77881-20120206112248.patch text/plain 3549 ericu U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2ODE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDRmYmFmZmRkY2ZkZTEyZTJiZDgwNTBmNGI3ZTZjYzg0MDJkMDBmZjcuLjg2YTAwZDNhZGViM2Q3 OGJmMzhmYWU0MTFkZWM1ZThmZmVlN2M2MzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTQgQEAKKzIwMTItMDItMDYgIEVyaWMgVWhyaGFuZSAgPGVyaWN1QGNocm9taXVt Lm9yZz4KKworICAgICAgICBbZmlsZXN5c3RlbS9DaHJvbWl1bV0gY3JhY2tGaWxlU3lzdGVtVVJM IG5lZWRzIHRvIHVzZSBpbm5lclVSTAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9Nzc4ODEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIHNyYy9Bc3luY0ZpbGVTeXN0ZW1DaHJvbWl1bS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpBc3luY0ZpbGVTeXN0ZW06OmNyYWNrRmlsZVN5c3RlbVVSTCk6CisgICAgICAg IEFkZCB0aGUgbmV3IGNvZGUgcGF0aCwgdGFrZW4gb25seSBpZiBpbm5lclVSTCBpcyBwcmVzZW50 LgorCiAyMDEyLTAyLTA0ICBTaGF3biBTaW5naCAgPHNoYXduc2luZ2hAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFtjaHJvbWl1bV0gQWRkIHN1cHBvcnQgdG8gZm9yY2UgZnVsbCBkYW1hZ2UgaW4g Q0NEYW1hZ2VUcmFja2VyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9B c3luY0ZpbGVTeXN0ZW1DaHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9B c3luY0ZpbGVTeXN0ZW1DaHJvbWl1bS5jcHAKaW5kZXggMjg3MTI4MjdkNTllNzJhZjVkODFjYjAx M2VmNGNiMzhjOGE3MzIzMC4uMWY5M2NmOTNlNDY3OGM1ODg4MDNhNzNkYTY5OTc2YTBiNWQ3MWZj YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvQXN5bmNGaWxlU3lzdGVt Q2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0FzeW5jRmlsZVN5 c3RlbUNocm9taXVtLmNwcApAQCAtNjMsMjggKzYzLDQ0IEBAIGJvb2wgQXN5bmNGaWxlU3lzdGVt OjpjcmFja0ZpbGVTeXN0ZW1VUkwoY29uc3QgS1VSTCYgdXJsLCBBc3luY0ZpbGVTeXN0ZW06OlR5 cGUmCiAgICAgaWYgKCF1cmwucHJvdG9jb2xJcygiZmlsZXN5c3RlbSIpKQogICAgICAgICByZXR1 cm4gZmFsc2U7CiAKLSAgICBLVVJMIG9yaWdpblVSTChQYXJzZWRVUkxTdHJpbmcsIHVybC5wYXRo KCkpOwotICAgIFN0cmluZyBwYXRoID0gZGVjb2RlVVJMRXNjYXBlU2VxdWVuY2VzKG9yaWdpblVS TC5wYXRoKCkpOwotICAgIGlmIChwYXRoLmlzRW1wdHkoKSB8fCBwYXRoWzBdICE9ICcvJykKLSAg ICAgICAgcmV0dXJuIGZhbHNlOwotICAgIHBhdGggPSBwYXRoLnN1YnN0cmluZygxKTsKLQotICAg IGlmIChwYXRoLnN0YXJ0c1dpdGgodGVtcG9yYXJ5UGF0aFByZWZpeCkpIHsKLSAgICAgICAgdHlw ZSA9IFRlbXBvcmFyeTsKLSAgICAgICAgcGF0aCA9IHBhdGguc3Vic3RyaW5nKHRlbXBvcmFyeVBh dGhQcmVmaXhMZW5ndGgpOwotICAgIH0gZWxzZSBpZiAocGF0aC5zdGFydHNXaXRoKHBlcnNpc3Rl bnRQYXRoUHJlZml4KSkgewotICAgICAgICB0eXBlID0gUGVyc2lzdGVudDsKLSAgICAgICAgcGF0 aCA9IHBhdGguc3Vic3RyaW5nKHBlcnNpc3RlbnRQYXRoUHJlZml4TGVuZ3RoKTsKLSAgICB9IGVs c2UgaWYgKHBhdGguc3RhcnRzV2l0aChleHRlcm5hbFBhdGhQcmVmaXgpKSB7Ci0gICAgICAgIHR5 cGUgPSBleHRlcm5hbFR5cGU7Ci0gICAgICAgIHBhdGggPSBwYXRoLnN1YnN0cmluZyhleHRlcm5h bFBhdGhQcmVmaXhMZW5ndGgpOwotICAgIH0gZWxzZQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0K LSAgICBpZiAocGF0aC5pc0VtcHR5KCkgfHwgcGF0aFswXSAhPSAnLycpCi0gICAgICAgIHJldHVy biBmYWxzZTsKLQotICAgIGZpbGVQYXRoLnN3YXAocGF0aCk7CisgICAgaWYgKHVybC5pbm5lclVS TCgpKSB7CisgICAgICAgIFN0cmluZyB0eXBlU3RyaW5nID0gdXJsLmlubmVyVVJMKCktPnBhdGgo KS5zdWJzdHJpbmcoMSk7CisgICAgICAgIGlmICh0eXBlU3RyaW5nID09IHRlbXBvcmFyeVBhdGhQ cmVmaXgpCisgICAgICAgICAgICB0eXBlID0gVGVtcG9yYXJ5OworICAgICAgICBlbHNlIGlmICh0 eXBlU3RyaW5nID09IHBlcnNpc3RlbnRQYXRoUHJlZml4KQorICAgICAgICAgICAgdHlwZSA9IFBl cnNpc3RlbnQ7CisgICAgICAgIGVsc2UgaWYgKHR5cGVTdHJpbmcgPT0gZXh0ZXJuYWxQYXRoUHJl Zml4KQorICAgICAgICAgICAgdHlwZSA9IGV4dGVybmFsVHlwZTsKKyAgICAgICAgZWxzZQorICAg ICAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgICAgIGZpbGVQYXRoID0gZGVjb2RlVVJMRXNj YXBlU2VxdWVuY2VzKHVybC5wYXRoKCkpOworICAgIH0gZWxzZSB7CisgICAgICAgIC8vIEZJWE1F OiBSZW1vdmUgdGhpcyBjbGF1c2Ugb25jZSBodHRwOi8vY29kZXJldmlldy5jaHJvbWl1bS5vcmcv NzgxMTAwNgorICAgICAgICAvLyBsYW5kcywgd2hpY2ggbWFrZXMgdGhpcyBkZWFkIGNvZGUuCisg ICAgICAgIEtVUkwgb3JpZ2luVVJMKFBhcnNlZFVSTFN0cmluZywgdXJsLnBhdGgoKSk7CisgICAg ICAgIFN0cmluZyBwYXRoID0gZGVjb2RlVVJMRXNjYXBlU2VxdWVuY2VzKG9yaWdpblVSTC5wYXRo KCkpOworICAgICAgICBpZiAocGF0aC5pc0VtcHR5KCkgfHwgcGF0aFswXSAhPSAnLycpCisgICAg ICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgICAgIHBhdGggPSBwYXRoLnN1YnN0cmluZygxKTsK KworICAgICAgICBpZiAocGF0aC5zdGFydHNXaXRoKHRlbXBvcmFyeVBhdGhQcmVmaXgpKSB7Cisg ICAgICAgICAgICB0eXBlID0gVGVtcG9yYXJ5OworICAgICAgICAgICAgcGF0aCA9IHBhdGguc3Vi c3RyaW5nKHRlbXBvcmFyeVBhdGhQcmVmaXhMZW5ndGgpOworICAgICAgICB9IGVsc2UgaWYgKHBh dGguc3RhcnRzV2l0aChwZXJzaXN0ZW50UGF0aFByZWZpeCkpIHsKKyAgICAgICAgICAgIHR5cGUg PSBQZXJzaXN0ZW50OworICAgICAgICAgICAgcGF0aCA9IHBhdGguc3Vic3RyaW5nKHBlcnNpc3Rl bnRQYXRoUHJlZml4TGVuZ3RoKTsKKyAgICAgICAgfSBlbHNlIGlmIChwYXRoLnN0YXJ0c1dpdGgo ZXh0ZXJuYWxQYXRoUHJlZml4KSkgeworICAgICAgICAgICAgdHlwZSA9IGV4dGVybmFsVHlwZTsK KyAgICAgICAgICAgIHBhdGggPSBwYXRoLnN1YnN0cmluZyhleHRlcm5hbFBhdGhQcmVmaXhMZW5n dGgpOworICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAg ICBpZiAocGF0aC5pc0VtcHR5KCkgfHwgcGF0aFswXSAhPSAnLycpCisgICAgICAgICAgICByZXR1 cm4gZmFsc2U7CisKKyAgICAgICAgZmlsZVBhdGguc3dhcChwYXRoKTsKKyAgICB9CiAgICAgcmV0 dXJuIHRydWU7CiB9CiAK