134565 2014-07-02 15:09:30 -0700 Remove keyed coding from FormData 2014-07-02 15:12:54 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1020064 0 andersca 2014-07-02 15:09:30 -0700 Remove keyed coding from FormData 1020065 1 234287 andersca 2014-07-02 15:11:04 -0700 Created attachment 234287 Patch 1020067 2 andersca 2014-07-02 15:12:54 -0700 Committed r170727: <http://trac.webkit.org/changeset/170727> 234287 2014-07-02 15:11:04 -0700 2014-07-02 15:12:32 -0700 Patch bug-134565-20140702151048.patch text/plain 7175 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTcwNzI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWJjNDI2NmEyY2FkNDA1 OTMxMTc3OWI0Njc3YzQ3NmVhM2RjYjBiZC4uNGVhMTQ1YzVlMWNiYzUxZjk0ZGZhNzIxMjljOTcy M2U2NmIyMTBjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5IEBACiAyMDE0LTA3LTAyICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgUmVtb3ZlIGtleWVk IGNvZGluZyBmcm9tIEZvcm1EYXRhCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMzQ1NjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvRm9ybURhdGEuY3BwOgorICAgICAgICAo V2ViQ29yZTo6ZW5jb2RlRWxlbWVudCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpkZWNv ZGVFbGVtZW50KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkZvcm1EYXRhOjplbmNvZGUp OiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6Rm9ybURhdGE6OmRlY29kZSk6IERlbGV0ZWQu CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9Gb3JtRGF0YS5oOgorCisyMDE0LTA3LTAyICBB bmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgR2V0IHJpZCBv ZiB0aGUgSGlzdG9yeUl0ZW0gZW5jb2RpbmcvZGVjb2RpbmcgaW4gV2ViQ29yZQogICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM0NTY0CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvRm9ybURhdGEuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9Gb3JtRGF0YS5jcHAKaW5kZXggMGI4NjE3ODk3MzNk MzY2OWQ4YTRiNzk1MjAyYTQzNGRhZmNkMWQ2Mi4uNzEwOWU0NTYwN2FlOWE5ZWQxOTc3MDcxYzcz MWMxODg0NGEwNjNmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9Gb3JtRGF0YS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9Gb3Jt RGF0YS5jcHAKQEAgLTMyLDcgKzMyLDYgQEAKICNpbmNsdWRlICJGaWxlU3lzdGVtLmgiCiAjaW5j bHVkZSAiRm9ybURhdGFCdWlsZGVyLmgiCiAjaW5jbHVkZSAiRm9ybURhdGFMaXN0LmgiCi0jaW5j bHVkZSAiS2V5ZWRDb2RpbmcuaCIKICNpbmNsdWRlICJNSU1FVHlwZVJlZ2lzdHJ5LmgiCiAjaW5j bHVkZSAiUGFnZS5oIgogI2luY2x1ZGUgIlRleHRFbmNvZGluZy5oIgpAQCAtNDIwLDMxICs0MTks NiBAQCBzdGF0aWMgdm9pZCBlbmNvZGVFbGVtZW50KEVuY29kZXImIGVuY29kZXIsIGNvbnN0IEZv cm1EYXRhRWxlbWVudCYgZWxlbWVudCkKICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKIH0KIAot c3RhdGljIHZvaWQgZW5jb2RlRWxlbWVudChLZXllZEVuY29kZXImIGVuY29kZXIsIGNvbnN0IEZv cm1EYXRhRWxlbWVudCYgZWxlbWVudCkKLXsKLSAgICBlbmNvZGVyLmVuY29kZUVudW0oInR5cGUi LCBlbGVtZW50Lm1fdHlwZSk7Ci0KLSAgICBzd2l0Y2ggKGVsZW1lbnQubV90eXBlKSB7Ci0gICAg Y2FzZSBGb3JtRGF0YUVsZW1lbnQ6OlR5cGU6OkRhdGE6Ci0gICAgICAgIGVuY29kZXIuZW5jb2Rl Qnl0ZXMoImRhdGEiLCByZWludGVycHJldF9jYXN0PGNvbnN0IHVpbnQ4X3QqPihlbGVtZW50Lm1f ZGF0YS5kYXRhKCkpLCBlbGVtZW50Lm1fZGF0YS5zaXplKCkpOwotICAgICAgICByZXR1cm47Ci0g ICAgY2FzZSBGb3JtRGF0YUVsZW1lbnQ6OlR5cGU6OkVuY29kZWRGaWxlOgotICAgICAgICBlbmNv ZGVyLmVuY29kZVN0cmluZygiZmlsZW5hbWUiLCBlbGVtZW50Lm1fZmlsZW5hbWUpOwotICAgICAg ICBlbmNvZGVyLmVuY29kZVN0cmluZygiZ2VuZXJhdGVkRmlsZW5hbWUiLCBlbGVtZW50Lm1fZ2Vu ZXJhdGVkRmlsZW5hbWUpOwotICAgICAgICBlbmNvZGVyLmVuY29kZUJvb2woInNob3VsZEdlbmVy YXRlRmlsZSIsIGVsZW1lbnQubV9zaG91bGRHZW5lcmF0ZUZpbGUpOwotICAgICAgICBlbmNvZGVy LmVuY29kZUludDY0KCJmaWxlU3RhcnQiLCBlbGVtZW50Lm1fZmlsZVN0YXJ0KTsKLSAgICAgICAg ZW5jb2Rlci5lbmNvZGVJbnQ2NCgiZmlsZUxlbmd0aCIsIGVsZW1lbnQubV9maWxlTGVuZ3RoKTsK LSAgICAgICAgZW5jb2Rlci5lbmNvZGVEb3VibGUoImV4cGVjdGVkRmlsZU1vZGlmaWNhdGlvblRp bWUiLCBlbGVtZW50Lm1fZXhwZWN0ZWRGaWxlTW9kaWZpY2F0aW9uVGltZSk7Ci0gICAgICAgIHJl dHVybjsKLQotICAgIGNhc2UgRm9ybURhdGFFbGVtZW50OjpUeXBlOjpFbmNvZGVkQmxvYjoKLSAg ICAgICAgZW5jb2Rlci5lbmNvZGVTdHJpbmcoInVybCIsIGVsZW1lbnQubV91cmwuc3RyaW5nKCkp OwotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci19 Ci0KIHN0YXRpYyBib29sIGRlY29kZUVsZW1lbnQoRGVjb2RlciYgZGVjb2RlciwgRm9ybURhdGFF bGVtZW50JiBlbGVtZW50KQogewogICAgIHVpbnQzMl90IHR5cGU7CkBAIC01MDgsNjkgKzQ4Miw2 IEBAIHN0YXRpYyBib29sIGRlY29kZUVsZW1lbnQoRGVjb2RlciYgZGVjb2RlciwgRm9ybURhdGFF bGVtZW50JiBlbGVtZW50KQogICAgIHJldHVybiBmYWxzZTsKIH0KIAotc3RhdGljIGJvb2wgZGVj b2RlRWxlbWVudChLZXllZERlY29kZXImIGRlY29kZXIsIEZvcm1EYXRhRWxlbWVudCYgZWxlbWVu dCkKLXsKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlRW51bSgidHlwZSIsIGVsZW1lbnQubV90eXBl LCBbXShGb3JtRGF0YUVsZW1lbnQ6OlR5cGUgdHlwZSkgewotICAgICAgICBzd2l0Y2ggKHR5cGUp IHsKLSAgICAgICAgY2FzZSBGb3JtRGF0YUVsZW1lbnQ6OlR5cGU6OkRhdGE6Ci0gICAgICAgIGNh c2UgRm9ybURhdGFFbGVtZW50OjpUeXBlOjpFbmNvZGVkRmlsZToKLSAgICAgICAgY2FzZSBGb3Jt RGF0YUVsZW1lbnQ6OlR5cGU6OkVuY29kZWRCbG9iOgotICAgICAgICAgICAgcmV0dXJuIHRydWU7 Ci0gICAgICAgIH0KLQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgfSkpCi0gICAgICAgIHJl dHVybiBmYWxzZTsKLQotICAgIHN3aXRjaCAoZWxlbWVudC5tX3R5cGUpIHsKLSAgICBjYXNlIEZv cm1EYXRhRWxlbWVudDo6VHlwZTo6RGF0YToKLSAgICAgICAgaWYgKCFkZWNvZGVyLmRlY29kZUJ5 dGVzKCJkYXRhIiwgZWxlbWVudC5tX2RhdGEpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwot ICAgICAgICBicmVhazsKLQotICAgIGNhc2UgRm9ybURhdGFFbGVtZW50OjpUeXBlOjpFbmNvZGVk RmlsZTogewotICAgICAgICBpZiAoIWRlY29kZXIuZGVjb2RlU3RyaW5nKCJmaWxlbmFtZSIsIGVs ZW1lbnQubV9maWxlbmFtZSkpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIGlm ICghZGVjb2Rlci5kZWNvZGVTdHJpbmcoImdlbmVyYXRlZEZpbGVuYW1lIiwgZWxlbWVudC5tX2dl bmVyYXRlZEZpbGVuYW1lKSkKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgaWYg KCFkZWNvZGVyLmRlY29kZUJvb2woInNob3VsZEdlbmVyYXRlRmlsZSIsIGVsZW1lbnQubV9zaG91 bGRHZW5lcmF0ZUZpbGUpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgICAgIGlu dDY0X3QgZmlsZVN0YXJ0OwotICAgICAgICBpZiAoIWRlY29kZXIuZGVjb2RlSW50NjQoImZpbGVT dGFydCIsIGZpbGVTdGFydCkpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgIGlm IChmaWxlU3RhcnQgPCAwKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgICAgIGlu dDY0X3QgZmlsZUxlbmd0aDsKLSAgICAgICAgaWYgKCFkZWNvZGVyLmRlY29kZUludDY0KCJmaWxl TGVuZ3RoIiwgZmlsZUxlbmd0aCkpCi0gICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAg IGlmIChmaWxlTGVuZ3RoICE9IEJsb2JEYXRhSXRlbTo6dG9FbmRPZkZpbGUgJiYgZmlsZUxlbmd0 aCA8IGZpbGVTdGFydCkKLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgICAgICBkb3Vi bGUgZXhwZWN0ZWRGaWxlTW9kaWZpY2F0aW9uVGltZTsKLSAgICAgICAgaWYgKCFkZWNvZGVyLmRl Y29kZURvdWJsZSgiZXhwZWN0ZWRGaWxlTW9kaWZpY2F0aW9uVGltZSIsIGV4cGVjdGVkRmlsZU1v ZGlmaWNhdGlvblRpbWUpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgICAgIGVs ZW1lbnQubV9maWxlU3RhcnQgPSBmaWxlU3RhcnQ7Ci0gICAgICAgIGVsZW1lbnQubV9maWxlTGVu Z3RoID0gZmlsZUxlbmd0aDsKLSAgICAgICAgZWxlbWVudC5tX2V4cGVjdGVkRmlsZU1vZGlmaWNh dGlvblRpbWUgPSBleHBlY3RlZEZpbGVNb2RpZmljYXRpb25UaW1lOwotICAgICAgICBicmVhazsK LSAgICB9Ci0KLSAgICBjYXNlIEZvcm1EYXRhRWxlbWVudDo6VHlwZTo6RW5jb2RlZEJsb2I6IHsK LSAgICAgICAgU3RyaW5nIGJsb2JVUkxTdHJpbmc7Ci0gICAgICAgIGlmICghZGVjb2Rlci5kZWNv ZGVTdHJpbmcoInVybCIsIGJsb2JVUkxTdHJpbmcpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNl OwotCi0gICAgICAgIGVsZW1lbnQubV91cmwgPSBVUkwoVVJMKCksIGJsb2JVUkxTdHJpbmcpOwot ICAgICAgICBicmVhazsKLSAgICB9Ci0gICAgfQotCi0gICAgcmV0dXJuIHRydWU7Ci19Ci0KIHZv aWQgRm9ybURhdGE6OmVuY29kZShFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogewogICAgIGVuY29k ZXIuZW5jb2RlQm9vbChtX2Fsd2F5c1N0cmVhbSk7CkBAIC01ODcsMTggKzQ5OCw2IEBAIHZvaWQg Rm9ybURhdGE6OmVuY29kZShFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogICAgIGVuY29kZXIuZW5j b2RlSW50NjQobV9pZGVudGlmaWVyKTsKIH0KIAotdm9pZCBGb3JtRGF0YTo6ZW5jb2RlKEtleWVk RW5jb2RlciYgZW5jb2RlcikgY29uc3QKLXsKLSAgICBlbmNvZGVyLmVuY29kZUJvb2woImFsd2F5 c1N0cmVhbSIsIG1fYWx3YXlzU3RyZWFtKTsKLSAgICBlbmNvZGVyLmVuY29kZUJ5dGVzKCJib3Vu ZGFyeSIsIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgdWludDhfdCo+KG1fYm91bmRhcnkuZGF0YSgp KSwgbV9ib3VuZGFyeS5zaXplKCkpOwotCi0gICAgZW5jb2Rlci5lbmNvZGVPYmplY3RzKCJlbGVt ZW50cyIsIG1fZWxlbWVudHMuYmVnaW4oKSwgbV9lbGVtZW50cy5lbmQoKSwgW10oS2V5ZWRFbmNv ZGVyJiBlbmNvZGVyLCBjb25zdCBGb3JtRGF0YUVsZW1lbnQmIGVsZW1lbnQpIHsKLSAgICAgICAg ZW5jb2RlRWxlbWVudChlbmNvZGVyLCBlbGVtZW50KTsKLSAgICB9KTsKLQotICAgIGVuY29kZXIu ZW5jb2RlSW50NjQoImlkZW50aWZpZXIiLCBtX2lkZW50aWZpZXIpOwotfQotCiBQYXNzUmVmUHRy PEZvcm1EYXRhPiBGb3JtRGF0YTo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIpCiB7CiAgICAgUmVm UHRyPEZvcm1EYXRhPiBkYXRhID0gRm9ybURhdGE6OmNyZWF0ZSgpOwpAQCAtNjMzLDI1ICs1MzIs NCBAQCBQYXNzUmVmUHRyPEZvcm1EYXRhPiBGb3JtRGF0YTo6ZGVjb2RlKERlY29kZXImIGRlY29k ZXIpCiAgICAgcmV0dXJuIGRhdGEucmVsZWFzZSgpOwogfQogCi1QYXNzUmVmUHRyPEZvcm1EYXRh PiBGb3JtRGF0YTo6ZGVjb2RlKEtleWVkRGVjb2RlciYgZGVjb2RlcikKLXsKLSAgICBSZWZQdHI8 Rm9ybURhdGE+IGRhdGEgPSBGb3JtRGF0YTo6Y3JlYXRlKCk7Ci0KLSAgICBpZiAoIWRlY29kZXIu ZGVjb2RlQm9vbCgiYWx3YXlzU3RyZWFtIiwgZGF0YS0+bV9hbHdheXNTdHJlYW0pKQotICAgICAg ICByZXR1cm4gbnVsbHB0cjsKLQotICAgIGlmICghZGVjb2Rlci5kZWNvZGVCeXRlcygiYm91bmRh cnkiLCBkYXRhLT5tX2JvdW5kYXJ5KSkKLSAgICAgICAgcmV0dXJuIG51bGxwdHI7Ci0KLSAgICBp ZiAoIWRlY29kZXIuZGVjb2RlT2JqZWN0cygiZWxlbWVudHMiLCBkYXRhLT5tX2VsZW1lbnRzLCBb XShLZXllZERlY29kZXImIGRlY29kZXIsIEZvcm1EYXRhRWxlbWVudCYgZWxlbWVudCkgewotICAg ICAgICByZXR1cm4gZGVjb2RlRWxlbWVudChkZWNvZGVyLCBlbGVtZW50KTsKLSAgICB9KSkKLSAg ICAgICAgcmV0dXJuIG51bGxwdHI7Ci0KLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlSW50NjQoImlk ZW50aWZpZXIiLCBkYXRhLT5tX2lkZW50aWZpZXIpKQotICAgICAgICByZXR1cm4gbnVsbHB0cjsK LQotICAgIHJldHVybiBkYXRhLnJlbGVhc2UoKTsKLX0KLQogfSAvLyBuYW1lc3BhY2UgV2ViQ29y ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9Gb3JtRGF0YS5o IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9Gb3JtRGF0YS5oCmluZGV4IDE0N2U4 OWQ1NTA2YWMxYjgyMTljNzEwZWU1NWEzZDgzZTIwZTM1ODUuLjRlMTdhYTI4YTc1MzUyZWQyZmM0 ZTU1Y2QxZGZiMTEyMGM3YWY3NTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvRm9ybURhdGEuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L0Zvcm1EYXRhLmgKQEAgLTMwLDggKzMwLDYgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFz cyBEb2N1bWVudDsKIGNsYXNzIEZvcm1EYXRhTGlzdDsKLWNsYXNzIEtleWVkRGVjb2RlcjsKLWNs YXNzIEtleWVkRW5jb2RlcjsKIGNsYXNzIFRleHRFbmNvZGluZzsKIAogY2xhc3MgRm9ybURhdGFF bGVtZW50IHsKQEAgLTEzMCw5ICsxMjgsNyBAQCBwdWJsaWM6CiAgICAgUGFzc1JlZlB0cjxGb3Jt RGF0YT4gZGVlcENvcHkoKSBjb25zdDsKIAogICAgIHZvaWQgZW5jb2RlKEVuY29kZXImKSBjb25z dDsKLSAgICB2b2lkIGVuY29kZShLZXllZEVuY29kZXImKSBjb25zdDsKICAgICBzdGF0aWMgUGFz c1JlZlB0cjxGb3JtRGF0YT4gZGVjb2RlKERlY29kZXImKTsKLSAgICBzdGF0aWMgUGFzc1JlZlB0 cjxGb3JtRGF0YT4gZGVjb2RlKEtleWVkRGVjb2RlciYpOwogCiAgICAgdm9pZCBhcHBlbmREYXRh KGNvbnN0IHZvaWQqIGRhdGEsIHNpemVfdCk7CiAgICAgdm9pZCBhcHBlbmRGaWxlKGNvbnN0IFN0 cmluZyYgZmlsZVBhdGgsIGJvb2wgc2hvdWxkR2VuZXJhdGVGaWxlID0gZmFsc2UpOwo=