56879 2011-03-22 16:50:56 -0700 OBJECT element with DivX source is always downloaded 2011-03-22 17:34:08 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 371813 0 andersca 2011-03-22 16:50:56 -0700 OBJECT element with DivX source is always downloaded 371820 1 86543 andersca 2011-03-22 16:56:49 -0700 Created attachment 86543 Patch 371833 2 86543 sam 2011-03-22 17:03:17 -0700 Comment on attachment 86543 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=86543&action=review > Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:1270 > + const Vector<String>& extensions = mimeClassInfo.extensions; > + > + if (find(extensions.begin(), extensions.end(), extension) != extensions.end()) > + return true; Can this use the new Vector::contains()? Should we make mimeClassInfo.extensions a HashSet? 371864 3 andersca 2011-03-22 17:34:08 -0700 Committed r81732: <http://trac.webkit.org/changeset/81732> 86543 2011-03-22 16:56:49 -0700 2011-03-22 17:03:17 -0700 Patch bug-56879-20110322165648.patch text/plain 7030 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgxNzIxKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDMtMjIgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBPQkpFQ1QgZWxlbWVudCB3aXRoIERpdlggc291cmNlIGlz IGFsd2F5cyBkb3dubG9hZGVkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD01Njg3OQorCisgICAgICAgICogU2hhcmVkL1BsdWdpbnMvTmV0c2NhcGUvbWFj L05ldHNjYXBlUGx1Z2luTW9kdWxlTWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpnZXRQbHVnaW5J bmZvRnJvbVByb3BlcnR5TGlzdHMpOgorICAgICAgICBBbHdheXMgdHJ5IHRvIHNwbGl0IGV2ZXJ5 IGVsZW1lbnQgaW4gdGhlICJXZWJQbHVnaW5FeHRlbnNpb25zIiBhcnJheSwgc2luY2UgdGhlIERp dlggcGx1Zy1pbgorICAgICAgICBzcGVjaWZpZXMgbXVsdGlwbGUgZmlsZSBleHRlbnNpb25zIGlu IGEgc2luZ2xlIGVsZW1lbnQuCisgICAgICAgIAorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29y ZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpwbHVn aW5TdXBwb3J0c0V4dGVuc2lvbik6CisgICAgICAgIEFkZCBhIG5ldyBoZWxwZXIgZnVuY3Rpb24u CisKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGllbnQ6Om9iamVjdENvbnRlbnRU eXBlKToKKyAgICAgICAgSWYgd2UgY2FuJ3QgZmluZCB0aGUgTUlNRSBmb3IgYW4gZXh0ZW5zaW9u LCBleHBsaWNpdGx5IGNoZWNrIGlmIHRoZXJlJ3MgYSBwbHVnaW4gdGhhdCBjbGFpbXMgdG8KKyAg ICAgICAgaGFuZGxlIHRoZSBnaXZlbiBleHRlbnNpb24uCisKIDIwMTEtMDMtMjIgIFNhbSBXZWlu aWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSdWJiZXItc3RhbXBlZCBieSBBbmRlcnMg Q2FybHNzb24uCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9OZXRzY2FwZS9t YWMvTmV0c2NhcGVQbHVnaW5Nb2R1bGVNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvU2hhcmVkL1BsdWdpbnMvTmV0c2NhcGUvbWFjL05ldHNjYXBlUGx1Z2luTW9kdWxlTWFjLm1t CShyZXZpc2lvbiA4MTcwOCkKKysrIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05ldHNj YXBlL21hYy9OZXRzY2FwZVBsdWdpbk1vZHVsZU1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtMTQy LDggKzE0MiwxNSBAQCBzdGF0aWMgYm9vbCBnZXRQbHVnaW5JbmZvRnJvbVByb3BlcnR5TGlzCiAg ICAgICAgICAgICBDRlN0cmluZ1JlZiBleHRlbnNpb24gPSBzdGF0aWNfY2FzdDxDRlN0cmluZ1Jl Zj4oQ0ZBcnJheUdldFZhbHVlQXRJbmRleChleHRlbnNpb25zQXJyYXksIGkpKTsKICAgICAgICAg ICAgIGlmICghZXh0ZW5zaW9uIHx8IENGR2V0VHlwZUlEKGV4dGVuc2lvbikgIT0gQ0ZTdHJpbmdH ZXRUeXBlSUQoKSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAgICAgICAgIAotICAg ICAgICAgICAgbWltZUNsYXNzSW5mby5leHRlbnNpb25zLmFwcGVuZChTdHJpbmcoZXh0ZW5zaW9u KS5sb3dlcigpKTsKKworICAgICAgICAgICAgLy8gVGhlIERpdlggcGx1Zy1pbiBsaXN0cyBtdWx0 aXBsZSBleHRlbnNpb25zIGluIGEgY29tbWEgc2VwYXJhdGVkIHN0cmluZyBpbnN0ZWFkIG9mIHVz aW5nCisgICAgICAgICAgICAvLyBtdWx0aXBsZSBhcnJheSBlbGVtZW50cyBpbiB0aGUgcHJvcGVy dHkgbGlzdC4gV29yayBhcm91bmQgdGhpcyBoZXJlIGJ5IHNwbGl0dGluZyB0aGUKKyAgICAgICAg ICAgIC8vIGV4dGVuc2lvbiBzdHJpbmcgaW50byBjb21wb25lbnRzLgorICAgICAgICAgICAgVmVj dG9yPFN0cmluZz4gZXh0ZW5zaW9uQ29tcG9uZW50czsKKyAgICAgICAgICAgIFN0cmluZyhleHRl bnNpb24pLmxvd2VyKCkuc3BsaXQoJywnLCBleHRlbnNpb25Db21wb25lbnRzKTsKKworICAgICAg ICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBleHRlbnNpb25Db21wb25lbnRzLnNpemUoKTsg KytpKQorICAgICAgICAgICAgICAgIG1pbWVDbGFzc0luZm8uZXh0ZW5zaW9ucy5hcHBlbmQoZXh0 ZW5zaW9uQ29tcG9uZW50c1tpXSk7CiAgICAgICAgIH0KIAogICAgICAgICAvLyBBZGQgdGhpcyBN SU1FIHR5cGUuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0 L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcAkocmV2aXNp b24gODE3MDgpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dl YkZyYW1lTG9hZGVyQ2xpZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjgsNyArNjgsOSBAQAog I2luY2x1ZGUgPFdlYkNvcmUvVUlFdmVudFdpdGhLZXlTdGF0ZS5oPgogI2luY2x1ZGUgPFdlYkNv cmUvV2lkZ2V0Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9XaW5kb3dGZWF0dXJlcy5oPgorI2luY2x1 ZGUgPGFsZ29yaXRobT4KIAordXNpbmcgbmFtZXNwYWNlIHN0ZDsKIHVzaW5nIG5hbWVzcGFjZSBX ZWJDb3JlOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKQEAgLTEyNTUsMTQgKzEyNTcsNDMgQEAgUGFz c1JlZlB0cjxXaWRnZXQ+IFdlYkZyYW1lTG9hZGVyQ2xpZW50OgogICAgIHJldHVybiBjcmVhdGVQ bHVnaW4ocGx1Z2luU2l6ZSwgYXBwbGV0RWxlbWVudCwgS1VSTCgpLCBwYXJhbU5hbWVzLCBwYXJh bVZhbHVlcywgImFwcGxpY2F0aW9uL3gtamF2YS1hcHBsZXQiLCBmYWxzZSk7CiB9CiAKK3N0YXRp YyBib29sIHBsdWdpblN1cHBvcnRzRXh0ZW5zaW9uKFBsdWdpbkRhdGEqIHBsdWdpbkRhdGEsIGNv bnN0IFN0cmluZyYgZXh0ZW5zaW9uKQoreworICAgIEFTU0VSVChleHRlbnNpb24ubG93ZXIoKSA9 PSBleHRlbnNpb24pOworCisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBwbHVnaW5EYXRhLT5t aW1lcygpLnNpemUoKTsgKytpKSB7CisgICAgICAgIGNvbnN0IE1pbWVDbGFzc0luZm8mIG1pbWVD bGFzc0luZm8gPSBwbHVnaW5EYXRhLT5taW1lcygpW2ldOworCisgICAgICAgIGNvbnN0IFZlY3Rv cjxTdHJpbmc+JiBleHRlbnNpb25zID0gbWltZUNsYXNzSW5mby5leHRlbnNpb25zOworCisgICAg ICAgIGlmIChmaW5kKGV4dGVuc2lvbnMuYmVnaW4oKSwgZXh0ZW5zaW9ucy5lbmQoKSwgZXh0ZW5z aW9uKSAhPSBleHRlbnNpb25zLmVuZCgpKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAg fQorICAgIHJldHVybiBmYWxzZTsKK30KKwogT2JqZWN0Q29udGVudFR5cGUgV2ViRnJhbWVMb2Fk ZXJDbGllbnQ6Om9iamVjdENvbnRlbnRUeXBlKGNvbnN0IEtVUkwmIHVybCwgY29uc3QgU3RyaW5n JiBtaW1lVHlwZUluKQogewogICAgIC8vIEZJWE1FOiBUaGlzIHNob3VsZCBiZSBtZXJnZWQgd2l0 aCBXZWJDb3JlOjpGcmFtZUxvYWRlcjo6ZGVmYXVsdE9iamVjdENvbnRlbnRUeXBlIHdoZW4gdGhl IHBsdWdpbiBjb2RlCiAgICAgLy8gaXMgY29uc29saWRhdGVkLgogCiAgICAgU3RyaW5nIG1pbWVU eXBlID0gbWltZVR5cGVJbjsKLSAgICBpZiAobWltZVR5cGUuaXNFbXB0eSgpKQotICAgICAgICBt aW1lVHlwZSA9IE1JTUVUeXBlUmVnaXN0cnk6OmdldE1JTUVUeXBlRm9yRXh0ZW5zaW9uKHVybC5w YXRoKCkuc3Vic3RyaW5nKHVybC5wYXRoKCkucmV2ZXJzZUZpbmQoJy4nKSArIDEpKTsKKyAgICBp ZiAobWltZVR5cGUuaXNFbXB0eSgpKSB7CisgICAgICAgIFN0cmluZyBleHRlbnNpb24gPSB1cmwu cGF0aCgpLnN1YnN0cmluZyh1cmwucGF0aCgpLnJldmVyc2VGaW5kKCcuJykgKyAxKS5sb3dlcigp OworCisgICAgICAgIC8vIFRyeSB0byBndWVzcyB0aGUgTUlNRSB0eXBlIGZyb20gdGhlIGV4dGVu c2lvbi4KKyAgICAgICAgbWltZVR5cGUgPSBNSU1FVHlwZVJlZ2lzdHJ5OjpnZXRNSU1FVHlwZUZv ckV4dGVuc2lvbihleHRlbnNpb24pOworCisgICAgICAgIGlmIChtaW1lVHlwZS5pc0VtcHR5KCkp IHsKKyAgICAgICAgICAgIC8vIENoZWNrIGlmIHRoZXJlJ3MgYSBwbHVnLWluIGFyb3VuZCB0aGF0 IGNhbiBoYW5kbGUgdGhlIGV4dGVuc2lvbi4KKyAgICAgICAgICAgIGlmIChXZWJQYWdlKiB3ZWJQ YWdlID0gbV9mcmFtZS0+cGFnZSgpKSB7CisgICAgICAgICAgICAgICAgaWYgKFBsdWdpbkRhdGEq IHBsdWdpbkRhdGEgPSB3ZWJQYWdlLT5jb3JlUGFnZSgpLT5wbHVnaW5EYXRhKCkpIHsKKyAgICAg ICAgICAgICAgICAgICAgaWYgKHBsdWdpblN1cHBvcnRzRXh0ZW5zaW9uKHBsdWdpbkRhdGEsIGV4 dGVuc2lvbikpCisgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gT2JqZWN0Q29udGVudE5l dHNjYXBlUGx1Z2luOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKyAgICAgICAg fQorICAgIH0KIAogICAgIGlmIChtaW1lVHlwZS5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiBP YmplY3RDb250ZW50RnJhbWU7CkluZGV4OiBTb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCShyZXZpc2lvbiA4MTcyMSkK KysrIFNvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDE1IEBACisyMDExLTAzLTIyICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgT0JKRUNU IGVsZW1lbnQgd2l0aCBEaXZYIHNvdXJjZSBpcyBhbHdheXMgZG93bmxvYWRlZAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTY4NzkKKworICAgICAgICAq IFBsdWdpbnMvV2ViQmFzZVBsdWdpblBhY2thZ2UubW06CisgICAgICAgICgtW1dlYkJhc2VQbHVn aW5QYWNrYWdlIGdldFBsdWdpbkluZm9Gcm9tUExpc3RzXSk6CisgICAgICAgIEFsd2F5cyB0cnkg dG8gc3BsaXQgZXZlcnkgZWxlbWVudCBpbiB0aGUgIldlYlBsdWdpbkV4dGVuc2lvbnMiIGFycmF5 LCBzaW5jZSB0aGUgRGl2WCBwbHVnLWluCisgICAgICAgIHNwZWNpZmllcyBtdWx0aXBsZSBmaWxl IGV4dGVuc2lvbnMgaW4gYSBzaW5nbGUgZWxlbWVudC4KKwogMjAxMS0wMy0yMiAgQnJhZHkgRWlk c29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5p Zy4KSW5kZXg6IFNvdXJjZS9XZWJLaXQvbWFjL1BsdWdpbnMvV2ViQmFzZVBsdWdpblBhY2thZ2Uu bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9tYWMvUGx1Z2lucy9XZWJCYXNlUGx1Z2lu UGFja2FnZS5tbQkocmV2aXNpb24gODE3MDgpCisrKyBTb3VyY2UvV2ViS2l0L21hYy9QbHVnaW5z L1dlYkJhc2VQbHVnaW5QYWNrYWdlLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zOCw2ICszOCw3IEBA CiAjaW1wb3J0IDx3dGYvQXNzZXJ0aW9ucy5oPgogI2ltcG9ydCA8d3RmL1RocmVhZGluZy5oPgog I2ltcG9ydCA8d3RmL1ZlY3Rvci5oPgorI2ltcG9ydCA8d3RmL3RleHQvQ1N0cmluZy5oPgogCiAj aW1wb3J0IDxXZWJLaXRTeXN0ZW1JbnRlcmZhY2UuaD4KIApAQCAtMjIyLDggKzIyMywxNSBAQCAt IChCT09MKWdldFBsdWdpbkluZm9Gcm9tUExpc3RzCiAgICAgICAgIE1pbWVDbGFzc0luZm8gbWlt ZUNsYXNzSW5mbzsKICAgICAgICAgCiAgICAgICAgIGV4dGVuc2lvbnMgPSBbW01JTUVEaWN0aW9u YXJ5IG9iamVjdEZvcktleTpXZWJQbHVnaW5FeHRlbnNpb25zS2V5XSBfd2ViX2xvd2VyY2FzZVN0 cmluZ3NdOwotICAgICAgICBmb3IgKE5TVUludGVnZXIgaSA9IDA7IGkgPCBbZXh0ZW5zaW9ucyBj b3VudF07ICsraSkKLSAgICAgICAgICAgIG1pbWVDbGFzc0luZm8uZXh0ZW5zaW9ucy5hcHBlbmQo KE5TU3RyaW5nICopW2V4dGVuc2lvbnMgb2JqZWN0QXRJbmRleDppXSk7CisgICAgICAgIGZvciAo TlNVSW50ZWdlciBpID0gMDsgaSA8IFtleHRlbnNpb25zIGNvdW50XTsgKytpKSB7CisgICAgICAg ICAgICAvLyBUaGUgRGl2WCBwbHVnLWluIGxpc3RzIG11bHRpcGxlIGV4dGVuc2lvbnMgaW4gYSBj b21tYSBzZXBhcmF0ZWQgc3RyaW5nIGluc3RlYWQgb2YgdXNpbmcKKyAgICAgICAgICAgIC8vIG11 bHRpcGxlIGFycmF5IGVsZW1lbnRzIGluIHRoZSBwcm9wZXJ0eSBsaXN0LiBXb3JrIGFyb3VuZCB0 aGlzIGhlcmUgYnkgc3BsaXR0aW5nIHRoZQorICAgICAgICAgICAgLy8gZXh0ZW5zaW9uIHN0cmlu ZyBpbnRvIGNvbXBvbmVudHMuCisgICAgICAgICAgICBOU0FycmF5ICpleHRlbnNpb25Db21wb25l bnRzID0gW1tleHRlbnNpb25zIG9iamVjdEF0SW5kZXg6aV0gY29tcG9uZW50c1NlcGFyYXRlZEJ5 U3RyaW5nOkAiLCJdOworCisgICAgICAgICAgICBmb3IgKE5TU3RyaW5nICpleHRlbnNpb24gaW4g ZXh0ZW5zaW9uQ29tcG9uZW50cykKKyAgICAgICAgICAgICAgICBtaW1lQ2xhc3NJbmZvLmV4dGVu c2lvbnMuYXBwZW5kKGV4dGVuc2lvbik7CisgICAgICAgIH0KIAogICAgICAgICBpZiAoW2V4dGVu c2lvbnMgY291bnRdID09IDApCiAgICAgICAgICAgICBleHRlbnNpb25zID0gW05TQXJyYXkgYXJy YXlXaXRoT2JqZWN0OkAiIl07Cg==