40896 2010-06-20 19:02:51 -0700 Add a MimeClassInfo Vector to WebBasePluginPackage 2010-06-20 19:13:12 -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 240559 0 andersca 2010-06-20 19:02:51 -0700 Add a MimeClassInfo Vector to WebBasePluginPackage 240560 1 59222 andersca 2010-06-20 19:05:09 -0700 Created attachment 59222 Patch 240563 2 andersca 2010-06-20 19:13:12 -0700 Committed r61522: <http://trac.webkit.org/changeset/61522> 59222 2010-06-20 19:05:09 -0700 2010-06-20 19:08:57 -0700 Patch bug-40896-20100620190508.patch text/plain 6193 andersca SW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hh bmdlTG9nCShyZXZpc2lvbiA2MTUyMCkKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMDYtMjAgIEFuZGVycyBDYXJsc3NvbiAgPGFu ZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBBZGQgYSBNaW1lQ2xhc3NJbmZvIFZlY3RvciB0byBXZWJCYXNlUGx1Z2luUGFj a2FnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDA4 OTYKKworICAgICAgICAqIFBsdWdpbnMvV2ViQmFzZVBsdWdpblBhY2thZ2UuaDoKKyAgICAgICAg KiBQbHVnaW5zL1dlYkJhc2VQbHVnaW5QYWNrYWdlLm1tOgorICAgICAgICAoLVtXZWJCYXNlUGx1 Z2luUGFja2FnZSBnZXRQbHVnaW5JbmZvRnJvbVBMaXN0c10pOgorICAgICAgICAoLVtXZWJCYXNl UGx1Z2luUGFja2FnZSBXZWJDb3JlOjpdKToKKyAgICAgICAgKiBQbHVnaW5zL1dlYk5ldHNjYXBl UGx1Z2luUGFja2FnZS5tbToKKyAgICAgICAgKC1bV2ViTmV0c2NhcGVQbHVnaW5QYWNrYWdlIGdl dFBsdWdpbkluZm9Gcm9tUmVzb3VyY2VzXSk6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2Vi UGxhdGZvcm1TdHJhdGVnaWVzLm1tOgorICAgICAgICAoV2ViUGxhdGZvcm1TdHJhdGVnaWVzOjpn ZXRQbHVnaW5JbmZvKToKKwogMjAxMC0wNi0yMCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FA YXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhbiBCZXJuc3RlaW4uCkluZGV4OiBX ZWJLaXQvbWFjL1BsdWdpbnMvV2ViQmFzZVBsdWdpblBhY2thZ2UuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJLaXQvbWFjL1BsdWdpbnMvV2ViQmFzZVBsdWdpblBhY2thZ2UuaAkocmV2aXNpb24gNjE1MTkp CisrKyBXZWJLaXQvbWFjL1BsdWdpbnMvV2ViQmFzZVBsdWdpblBhY2thZ2UuaAkod29ya2luZyBj b3B5KQpAQCAtNjAsNiArNjAsOCBAQCBAaW50ZXJmYWNlIFdlYkJhc2VQbHVnaW5QYWNrYWdlIDog TlNPYmplCiAgICAgV2ViQ29yZTo6U3RyaW5nIHBhdGg7CiAgICAgV2ViQ29yZTo6U3RyaW5nIHBs dWdpbkRlc2NyaXB0aW9uOwogCisgICAgVmVjdG9yPFdlYkNvcmU6Ok1pbWVDbGFzc0luZm8+IG1p bWVUeXBlczsKKwogICAgIENGQnVuZGxlUmVmIGNmQnVuZGxlOwogCiAgICAgTlNEaWN0aW9uYXJ5 ICpNSU1FVG9EZXNjcmlwdGlvbjsKQEAgLTgyLDYgKzg0LDggQEAgQGludGVyZmFjZSBXZWJCYXNl UGx1Z2luUGFja2FnZSA6IE5TT2JqZQogLSAoY29uc3QgV2ViQ29yZTo6U3RyaW5nJilwYXRoOwog LSAoY29uc3QgV2ViQ29yZTo6U3RyaW5nJilwbHVnaW5EZXNjcmlwdGlvbjsKIAorLSAoY29uc3Qg VmVjdG9yPFdlYkNvcmU6Ok1pbWVDbGFzc0luZm8+JiltaW1lVHlwZXM7CisKIC0gKFdlYkNvcmU6 OlN0cmluZylidW5kbGVJZGVudGlmaWVyOwogCiAtIChCT09MKXN1cHBvcnRzRXh0ZW5zaW9uOihO U1N0cmluZyAqKWV4dGVuc2lvbjsKSW5kZXg6IFdlYktpdC9tYWMvUGx1Z2lucy9XZWJCYXNlUGx1 Z2luUGFja2FnZS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL1BsdWdpbnMvV2ViQmFzZVBs dWdpblBhY2thZ2UubW0JKHJldmlzaW9uIDYxNTE5KQorKysgV2ViS2l0L21hYy9QbHVnaW5zL1dl YkJhc2VQbHVnaW5QYWNrYWdlLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yMjAsMTUgKzIyMCwyNSBA QCAtIChCT09MKWdldFBsdWdpbkluZm9Gcm9tUExpc3RzCiAgICAgICAgIGlmIChpc0VuYWJsZWQg JiYgW2lzRW5hYmxlZCBib29sVmFsdWVdID09IE5PKQogICAgICAgICAgICAgY29udGludWU7CiAK KyAgICAgICAgTWltZUNsYXNzSW5mbyBtaW1lQ2xhc3NJbmZvOworICAgICAgICAKICAgICAgICAg ZXh0ZW5zaW9ucyA9IFtbTUlNRURpY3Rpb25hcnkgb2JqZWN0Rm9yS2V5OldlYlBsdWdpbkV4dGVu c2lvbnNLZXldIF93ZWJfbG93ZXJjYXNlU3RyaW5nc107CisgICAgICAgIGZvciAoTlNVSW50ZWdl ciBpID0gMDsgaSA8IFtleHRlbnNpb25zIGNvdW50XTsgKytpKQorICAgICAgICAgICAgbWltZUNs YXNzSW5mby5leHRlbnNpb25zLmFwcGVuZCgoTlNTdHJpbmcgKilbZXh0ZW5zaW9ucyBvYmplY3RB dEluZGV4OmldKTsKKwogICAgICAgICBpZiAoW2V4dGVuc2lvbnMgY291bnRdID09IDApCiAgICAg ICAgICAgICBleHRlbnNpb25zID0gW05TQXJyYXkgYXJyYXlXaXRoT2JqZWN0OkAiIl07CiAKKyAg ICAgICAgbWltZUNsYXNzSW5mby50eXBlID0gU3RyaW5nKE1JTUUpLmxvd2VyKCk7CiAgICAgICAg IE1JTUUgPSBbTUlNRSBsb3dlcmNhc2VTdHJpbmddOwogCiAgICAgICAgIFtNSU1FVG9FeHRlbnNp b25zRGljdGlvbmFyeSBzZXRPYmplY3Q6ZXh0ZW5zaW9ucyBmb3JLZXk6TUlNRV07CiAKICAgICAg ICAgZGVzY3JpcHRpb24gPSBbTUlNRURpY3Rpb25hcnkgb2JqZWN0Rm9yS2V5OldlYlBsdWdpblR5 cGVEZXNjcmlwdGlvbktleV07CisgICAgICAgIG1pbWVDbGFzc0luZm8uZGVzYyA9IGRlc2NyaXB0 aW9uOworCisgICAgICAgIG1pbWVUeXBlcy5hcHBlbmQobWltZUNsYXNzSW5mbyk7CisKICAgICAg ICAgaWYgKCFkZXNjcmlwdGlvbikKICAgICAgICAgICAgIGRlc2NyaXB0aW9uID0gQCIiOwogCkBA IC0zMDgsNiArMzE4LDExIEBAIC0gKGNvbnN0IFN0cmluZyYpcGx1Z2luRGVzY3JpcHRpb24KICAg ICByZXR1cm4gcGx1Z2luRGVzY3JpcHRpb247CiB9CiAKKy0gKGNvbnN0IFZlY3RvcjxXZWJDb3Jl OjpNaW1lQ2xhc3NJbmZvPiYpbWltZVR5cGVzCit7CisgICAgcmV0dXJuIG1pbWVUeXBlczsKK30K KwogLSAoTlNBcnJheSAqKU1JTUVUeXBlcwogewogICAgIHJldHVybiBbTUlNRVRvRXh0ZW5zaW9u cyBhbGxLZXlzXTsKSW5kZXg6IFdlYktpdC9tYWMvUGx1Z2lucy9XZWJOZXRzY2FwZVBsdWdpblBh Y2thZ2UubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21hYy9QbHVnaW5zL1dlYk5ldHNjYXBlUGx1 Z2luUGFja2FnZS5tbQkocmV2aXNpb24gNjE1MTkpCisrKyBXZWJLaXQvbWFjL1BsdWdpbnMvV2Vi TmV0c2NhcGVQbHVnaW5QYWNrYWdlLm1tCSh3b3JraW5nIGNvcHkpCkBAIC00Myw2ICs0Myw4IEBA CiB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwogI2VuZGlmCiAKK3VzaW5nIG5hbWVzcGFjZSBXZWJD b3JlOworCiAjaWZkZWYgU1VQUE9SVF9DRk0KIHR5cGVkZWYgdm9pZCAoKiBGdW5jdGlvblBvaW50 ZXIpKHZvaWQpOwogdHlwZWRlZiB2b2lkICgqIFRyYW5zaXRpb25WZWN0b3IpKHZvaWQpOwpAQCAt MTY2LDkgKzE2OCwxNSBAQCAtIChCT09MKWdldFBsdWdpbkluZm9Gcm9tUmVzb3VyY2VzCiAgICAg ICAgIGlmICghTUlNRSkKICAgICAgICAgICAgIGJyZWFrOwogCisgICAgICAgIE1pbWVDbGFzc0lu Zm8gbWltZUNsYXNzSW5mbzsKKyAgICAgICAgbWltZUNsYXNzSW5mby50eXBlID0gU3RyaW5nKE1J TUUpLmxvd2VyKCk7CisKICAgICAgICAgZXh0ZW5zaW9uc0xpc3QgPSBbW3NlbGYgc3RyaW5nRm9y U3RyaW5nTGlzdElEOk1JTUVMaXN0U3RyaW5nU3RyaW5nTnVtYmVyIGFuZEluZGV4OmkrMV0gbG93 ZXJjYXNlU3RyaW5nXTsKICAgICAgICAgaWYgKGV4dGVuc2lvbnNMaXN0KSB7CiAgICAgICAgICAg ICBleHRlbnNpb25zID0gW2V4dGVuc2lvbnNMaXN0IGNvbXBvbmVudHNTZXBhcmF0ZWRCeVN0cmlu ZzpAIiwiXTsKKyAgICAgICAgICAgIGZvciAoTlNVSW50ZWdlciBqID0gMDsgaiA8IFtleHRlbnNp b25zIGNvdW50XTsgKytqKQorICAgICAgICAgICAgICAgIG1pbWVDbGFzc0luZm8uZXh0ZW5zaW9u cy5hcHBlbmQoKE5TU3RyaW5nICopW2V4dGVuc2lvbnMgb2JqZWN0QXRJbmRleDpqXSk7CisKICAg ICAgICAgICAgIFtNSU1FVG9FeHRlbnNpb25zRGljdGlvbmFyeSBzZXRPYmplY3Q6ZXh0ZW5zaW9u cyBmb3JLZXk6TUlNRV07CiAgICAgICAgIH0gZWxzZQogICAgICAgICAgICAgLy8gRFJNIGFuZCBX TVAgY2xhaW0gTUlNRXMgd2l0aG91dCBleHRlbnNpb25zLiBVc2UgYSBAIiIgZXh0ZW5zaW9uIGlu IHRoaXMgY2FzZS4KQEAgLTE3NiwxMCArMTg0LDE0IEBAIC0gKEJPT0wpZ2V0UGx1Z2luSW5mb0Zy b21SZXNvdXJjZXMKICAgICAgICAgCiAgICAgICAgIGRlc2NyaXB0aW9uID0gW3NlbGYgc3RyaW5n Rm9yU3RyaW5nTGlzdElEOk1JTUVEZXNjcmlwdGlvblN0cmluZ051bWJlcgogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhbmRJbmRleDpbTUlNRVRvRXh0ZW5zaW9uc0Rp Y3Rpb25hcnkgY291bnRdXTsKKyAgICAgICAgbWltZUNsYXNzSW5mby5kZXNjID0gZGVzY3JpcHRp b247CisKICAgICAgICAgaWYgKGRlc2NyaXB0aW9uKQogICAgICAgICAgICAgW01JTUVUb0Rlc2Ny aXB0aW9uRGljdGlvbmFyeSBzZXRPYmplY3Q6ZGVzY3JpcHRpb24gZm9yS2V5Ok1JTUVdOwogICAg ICAgICBlbHNlCiAgICAgICAgICAgICBbTUlNRVRvRGVzY3JpcHRpb25EaWN0aW9uYXJ5IHNldE9i amVjdDpAIiIgZm9yS2V5Ok1JTUVdOworICAgICAgICAKKyAgICAgICAgbWltZVR5cGVzLmFwcGVu ZChtaW1lQ2xhc3NJbmZvKTsKICAgICB9CiAKICAgICBbc2VsZiBzZXRNSU1FVG9EZXNjcmlwdGlv bkRpY3Rpb25hcnk6TUlNRVRvRGVzY3JpcHRpb25EaWN0aW9uYXJ5XTsKSW5kZXg6IFdlYktpdC9t YWMvV2ViQ29yZVN1cHBvcnQvV2ViUGxhdGZvcm1TdHJhdGVnaWVzLm1tCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViUGxhdGZvcm1TdHJhdGVnaWVzLm1tCShyZXZp c2lvbiA2MTUwOCkKKysrIFdlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViUGxhdGZvcm1TdHJh dGVnaWVzLm1tCSh3b3JraW5nIGNvcHkpCkBAIC03MSwyNSArNzEsNyBAQCB2b2lkIFdlYlBsYXRm b3JtU3RyYXRlZ2llczo6Z2V0UGx1Z2luSW5mCiAgICAgICAgIHBsdWdpbkluZm8ubmFtZSA9IFtw bHVnaW4gbmFtZV07CiAgICAgICAgIHBsdWdpbkluZm8uZmlsZSA9IFtwbHVnaW4gZmlsZW5hbWVd OwogICAgICAgICBwbHVnaW5JbmZvLmRlc2MgPSBbcGx1Z2luIHBsdWdpbkRlc2NyaXB0aW9uXTsK LQotICAgICAgICBOU0FycmF5ICpNSU1FVHlwZXMgPSBbcGx1Z2luIE1JTUVUeXBlc107Ci0gICAg ICAgIGZvciAoTlNVSW50ZWdlciBpID0gMDsgaSA8IFtNSU1FVHlwZXMgY291bnRdOyArK2kpIHsK LSAgICAgICAgICAgIE5TU3RyaW5nICpNSU1FVHlwZSA9IFtNSU1FVHlwZXMgb2JqZWN0QXRJbmRl eDppXTsKLQotICAgICAgICAgICAgTWltZUNsYXNzSW5mbyBtaW1lQ2xhc3NJbmZvOwotCi0gICAg ICAgICAgICBtaW1lQ2xhc3NJbmZvLnR5cGUgPSBTdHJpbmcoTUlNRVR5cGUpLmxvd2VyKCk7Ci0g ICAgICAgICAgICAKLSAgICAgICAgICAgIE5TQXJyYXkgKmV4dGVuc2lvbnMgPSBbcGx1Z2luIGV4 dGVuc2lvbnNGb3JNSU1FVHlwZTpNSU1FVHlwZV07Ci0gICAgICAgICAgICBmb3IgKE5TVUludGVn ZXIgaSA9IDA7IGkgPCBbZXh0ZW5zaW9ucyBjb3VudF07ICsraSkgewotICAgICAgICAgICAgICAg IE5TU3RyaW5nICpleHRlbnNpb24gPSBbZXh0ZW5zaW9ucyBvYmplY3RBdEluZGV4OmldOwotICAg ICAgICAgICAgICAgIG1pbWVDbGFzc0luZm8uZXh0ZW5zaW9ucy5hcHBlbmQoZXh0ZW5zaW9uKTsK LSAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgbWltZUNsYXNzSW5mby5kZXNjID0gW3BsdWdp biBkZXNjcmlwdGlvbkZvck1JTUVUeXBlOk1JTUVUeXBlXTsKLSAgICAgICAgICAgIAotICAgICAg ICAgICAgcGx1Z2luSW5mby5taW1lcy5hcHBlbmQobWltZUNsYXNzSW5mbyk7Ci0gICAgICAgIH0K KyAgICAgICAgcGx1Z2luSW5mby5taW1lcyA9IFtwbHVnaW4gbWltZVR5cGVzXTsKIAogICAgICAg ICBwbHVnaW5zLmFwcGVuZChwbHVnaW5JbmZvKTsKICAgICB9Cg==