40898 2010-06-20 20:05:22 -0700 Get rid of the old MIMETypes getter method 2010-06-20 20:20:33 -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 240572 0 andersca 2010-06-20 20:05:22 -0700 Get rid of the old MIMETypes getter method 240573 1 59224 andersca 2010-06-20 20:06:24 -0700 Created attachment 59224 Patch 240574 2 59224 mitz 2010-06-20 20:10:27 -0700 Comment on attachment 59224 Patch > + while ((plugin = [pluginEnumerator nextObject]) != nil) { You should drop “ != nil”. 240576 3 andersca 2010-06-20 20:20:33 -0700 Committed r61525: <http://trac.webkit.org/changeset/61525> 59224 2010-06-20 20:06:24 -0700 2010-06-20 20:10:27 -0700 Patch bug-40898-20100620200622.patch text/plain 5790 andersca SW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hh bmdlTG9nCShyZXZpc2lvbiA2MTUyNCkKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTAtMDYtMjAgIEFuZGVycyBDYXJsc3NvbiAgPGFu ZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBHZXQgcmlkIG9mIHRoZSBvbGQgTUlNRVR5cGVzIGdldHRlciBtZXRob2QKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQwODk4CisKKyAg ICAgICAgKiBQbHVnaW5zL1dlYkJhc2VQbHVnaW5QYWNrYWdlLmg6CisgICAgICAgICogUGx1Z2lu cy9XZWJCYXNlUGx1Z2luUGFja2FnZS5tbToKKyAgICAgICAgKC1bV2ViQmFzZVBsdWdpblBhY2th Z2Ugc3VwcG9ydHNFeHRlbnNpb246XSk6CisgICAgICAgICgtW1dlYkJhc2VQbHVnaW5QYWNrYWdl IHN1cHBvcnRzTUlNRVR5cGU6V2ViQ29yZTo6XSk6CisgICAgICAgICgtW1dlYkJhc2VQbHVnaW5Q YWNrYWdlIE1JTUVUeXBlRm9yRXh0ZW5zaW9uOl0pOgorICAgICAgICAqIFBsdWdpbnMvV2ViUGx1 Z2luRGF0YWJhc2UubW06CisgICAgICAgICgtW1dlYlBsdWdpbkRhdGFiYXNlIHJlZnJlc2hdKToK KyAgICAgICAgKC1bV2ViUGx1Z2luRGF0YWJhc2UgX3JlbW92ZVBsdWdpbjpdKToKKwogMjAxMC0w Ni0yMCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IERhbiBCZXJuc3RlaW4uCkluZGV4OiBXZWJLaXQvbWFjL1BsdWdpbnMvV2ViQmFz ZVBsdWdpblBhY2thZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL1BsdWdpbnMvV2ViQmFz ZVBsdWdpblBhY2thZ2UuaAkocmV2aXNpb24gNjE1MjMpCisrKyBXZWJLaXQvbWFjL1BsdWdpbnMv V2ViQmFzZVBsdWdpblBhY2thZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtODgsMTMgKzg4LDEwIEBA IEBpbnRlcmZhY2UgV2ViQmFzZVBsdWdpblBhY2thZ2UgOiBOU09iamUKIC0gKFdlYkNvcmU6OlN0 cmluZylidW5kbGVJZGVudGlmaWVyOwogCiAtIChCT09MKXN1cHBvcnRzRXh0ZW5zaW9uOihjb25z dCBXZWJDb3JlOjpTdHJpbmcmKWV4dGVuc2lvbjsKLS0gKEJPT0wpc3VwcG9ydHNNSU1FVHlwZToo TlNTdHJpbmcgKilNSU1FVHlwZTsKLQotLSAoTlNBcnJheSAqKU1JTUVUeXBlczsKKy0gKEJPT0wp c3VwcG9ydHNNSU1FVHlwZTooY29uc3QgV2ViQ29yZTo6U3RyaW5nJilNSU1FVHlwZTsKIAogLSAo TlNTdHJpbmcgKilkZXNjcmlwdGlvbkZvck1JTUVUeXBlOihOU1N0cmluZyAqKU1JTUVUeXBlOwog LSAoTlNTdHJpbmcgKilNSU1FVHlwZUZvckV4dGVuc2lvbjooY29uc3QgV2ViQ29yZTo6U3RyaW5n JilleHRlbnNpb247Ci0tIChOU0FycmF5ICopZXh0ZW5zaW9uc0Zvck1JTUVUeXBlOihOU1N0cmlu ZyAqKU1JTUVUeXBlOwogCiAtICh2b2lkKXNldE1JTUVUb0Rlc2NyaXB0aW9uRGljdGlvbmFyeToo TlNEaWN0aW9uYXJ5ICopTUlNRVRvRGVzY3JpcHRpb25EaWN0aW9uYXJ5OwogLSAodm9pZClzZXRN SU1FVG9FeHRlbnNpb25zRGljdGlvbmFyeTooTlNEaWN0aW9uYXJ5ICopTUlNRVRvRXh0ZW5zaW9u c0RpY3Rpb25hcnk7CkluZGV4OiBXZWJLaXQvbWFjL1BsdWdpbnMvV2ViQmFzZVBsdWdpblBhY2th Z2UubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21hYy9QbHVnaW5zL1dlYkJhc2VQbHVnaW5QYWNr YWdlLm1tCShyZXZpc2lvbiA2MTUyMykKKysrIFdlYktpdC9tYWMvUGx1Z2lucy9XZWJCYXNlUGx1 Z2luUGFja2FnZS5tbQkod29ya2luZyBjb3B5KQpAQCAtMjgsNiArMjgsNyBAQAogCiAjaW1wb3J0 IDxXZWJLaXQvV2ViQmFzZVBsdWdpblBhY2thZ2UuaD4KIAorI2ltcG9ydCA8YWxnb3JpdGhtPgog I2ltcG9ydCA8V2ViQ29yZS9XZWJDb3JlT2JqQ0V4dHJhcy5oPgogI2ltcG9ydCA8V2ViS2l0L1dl YktpdE5TU3RyaW5nRXh0cmFzLmg+CiAjaW1wb3J0IDxXZWJLaXQvV2ViTlNPYmplY3RFeHRyYXMu aD4KQEAgLTU4LDYgKzU5LDcgQEAgQGludGVyZmFjZSBOU0FycmF5IChXZWJQbHVnaW5FeHRlbnNp b25zKQogLSAoTlNBcnJheSAqKV93ZWJfbG93ZXJjYXNlU3RyaW5nczsKIEBlbmQ7CiAKK3VzaW5n IG5hbWVzcGFjZSBzdGQ7CiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogQGltcGxlbWVudGF0 aW9uIFdlYkJhc2VQbHVnaW5QYWNrYWdlCkBAIC0zMzAsMjAgKzMzMiwyNSBAQCAtIChCT09MKXN1 cHBvcnRzRXh0ZW5zaW9uOihjb25zdCBTdHJpbmcmCiAgICAgQVNTRVJUKGV4dGVuc2lvbi5sb3dl cigpID09IGV4dGVuc2lvbik7CiAgICAgCiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtaW1l VHlwZXMuc2l6ZSgpOyArK2kpIHsKLSAgICAgICAgY29uc3QgTWltZUNsYXNzSW5mbyYgbWltZUNs YXNzSW5mbyA9IG1pbWVUeXBlc1tpXTsKLSAgICAgICAgCi0gICAgICAgIGZvciAoc2l6ZV90IGog PSAwOyBpIDwgbWltZUNsYXNzSW5mby5leHRlbnNpb25zLnNpemUoKTsgKytqKSB7Ci0gICAgICAg ICAgICBpZiAobWltZUNsYXNzSW5mby5leHRlbnNpb25zW2pdID09IGV4dGVuc2lvbikKLSAgICAg ICAgICAgICAgICByZXR1cm4gWUVTOwotICAgICAgICB9CisgICAgICAgIGNvbnN0IFZlY3RvcjxT dHJpbmc+JiBleHRlbnNpb25zID0gbWltZVR5cGVzW2ldLmV4dGVuc2lvbnM7CisKKyAgICAgICAg aWYgKGZpbmQoZXh0ZW5zaW9ucy5iZWdpbigpLCBleHRlbnNpb25zLmVuZCgpLCBleHRlbnNpb24p ICE9IGV4dGVuc2lvbnMuZW5kKCkpCisgICAgICAgICAgICByZXR1cm4gWUVTOwogICAgIH0KIAog ICAgIHJldHVybiBOTzsKIH0KIAotLSAoQk9PTClzdXBwb3J0c01JTUVUeXBlOihOU1N0cmluZyAq KU1JTUVUeXBlCistIChCT09MKXN1cHBvcnRzTUlNRVR5cGU6KGNvbnN0IFdlYkNvcmU6OlN0cmlu ZyYpbWltZVR5cGUKIHsKLSAgICByZXR1cm4gW01JTUVUb0V4dGVuc2lvbnMgb2JqZWN0Rm9yS2V5 Ok1JTUVUeXBlXSAhPSAwOworICAgIEFTU0VSVChtaW1lVHlwZS5sb3dlcigpID09IG1pbWVUeXBl KTsKKyAgICAKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1pbWVUeXBlcy5zaXplKCk7ICsr aSkgeworICAgICAgICBpZiAobWltZVR5cGVzW2ldLnR5cGUgPT0gbWltZVR5cGUpCisgICAgICAg ICAgICByZXR1cm4gWUVTOworICAgIH0KKyAgICAKKyAgICByZXR1cm4gTk87CiB9CiAKIC0gKE5T U3RyaW5nICopZGVzY3JpcHRpb25Gb3JNSU1FVHlwZTooTlNTdHJpbmcgKilNSU1FVHlwZQpAQCAt MzU3LDcgKzM2NCwxMSBAQCAtIChOU1N0cmluZyAqKU1JTUVUeXBlRm9yRXh0ZW5zaW9uOihjb25z CiAgICAgCiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtaW1lVHlwZXMuc2l6ZSgpOyArK2kp IHsKICAgICAgICAgY29uc3QgTWltZUNsYXNzSW5mbyYgbWltZUNsYXNzSW5mbyA9IG1pbWVUeXBl c1tpXTsKLSAgICAgICAgCisgICAgICAgIGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBleHRlbnNpb25z ID0gbWltZUNsYXNzSW5mby5leHRlbnNpb25zOworCisgICAgICAgIGlmIChmaW5kKGV4dGVuc2lv bnMuYmVnaW4oKSwgZXh0ZW5zaW9ucy5lbmQoKSwgZXh0ZW5zaW9uKSAhPSBleHRlbnNpb25zLmVu ZCgpKQorICAgICAgICAgICAgcmV0dXJuIG1pbWVDbGFzc0luZm8udHlwZTsKKwogICAgICAgICBm b3IgKHNpemVfdCBqID0gMDsgaiA8IG1pbWVDbGFzc0luZm8uZXh0ZW5zaW9ucy5zaXplKCk7ICsr aikgewogICAgICAgICAgICAgaWYgKG1pbWVDbGFzc0luZm8uZXh0ZW5zaW9uc1tqXSA9PSBleHRl bnNpb24pCiAgICAgICAgICAgICAgICAgcmV0dXJuIG1pbWVDbGFzc0luZm8udHlwZTsKSW5kZXg6 IFdlYktpdC9tYWMvUGx1Z2lucy9XZWJQbHVnaW5EYXRhYmFzZS5tbQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJLaXQvbWFjL1BsdWdpbnMvV2ViUGx1Z2luRGF0YWJhc2UubW0JKHJldmlzaW9uIDYxNTEwKQor KysgV2ViS2l0L21hYy9QbHVnaW5zL1dlYlBsdWdpbkRhdGFiYXNlLm1tCSh3b3JraW5nIGNvcHkp CkBAIC00NSw2ICs0NSw4IEBACiAjaW1wb3J0IDxXZWJLaXRTeXN0ZW1JbnRlcmZhY2UuaD4KICNp bXBvcnQgPHd0Zi9Bc3NlcnRpb25zLmg+CiAKK3VzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOworCiBz dGF0aWMgdm9pZCBjaGVja0NhbmRpZGF0ZShXZWJCYXNlUGx1Z2luUGFja2FnZSAqKmN1cnJlbnRQ bHVnaW4sIFdlYkJhc2VQbHVnaW5QYWNrYWdlICoqY2FuZGlkYXRlUGx1Z2luKTsKIAogQGludGVy ZmFjZSBXZWJQbHVnaW5EYXRhYmFzZSAoSW50ZXJuYWwpCkBAIC0zMDQsOCArMzA2LDExIEBAIC0g KHZvaWQpcmVmcmVzaAogICAgIC8vIEJ1aWxkIGEgbGlzdCBvZiBNSU1FIHR5cGVzLgogICAgIE5T TXV0YWJsZVNldCAqTUlNRVR5cGVzID0gW1tOU011dGFibGVTZXQgYWxsb2NdIGluaXRdOwogICAg IHBsdWdpbkVudW1lcmF0b3IgPSBbcGx1Z2lucyBvYmplY3RFbnVtZXJhdG9yXTsKLSAgICB3aGls ZSAoKHBsdWdpbiA9IFtwbHVnaW5FbnVtZXJhdG9yIG5leHRPYmplY3RdKSAhPSBuaWwpCi0gICAg ICAgIFtNSU1FVHlwZXMgYWRkT2JqZWN0c0Zyb21BcnJheTpbcGx1Z2luIE1JTUVUeXBlc11dOwor ICAgIHdoaWxlICgocGx1Z2luID0gW3BsdWdpbkVudW1lcmF0b3IgbmV4dE9iamVjdF0pICE9IG5p bCkgeworICAgICAgICBjb25zdCBWZWN0b3I8TWltZUNsYXNzSW5mbz4mIG1pbWVUeXBlcyA9IFtw bHVnaW4gbWltZVR5cGVzXTsKKyAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtaW1lVHlw ZXMuc2l6ZSgpOyArK2kpCisgICAgICAgICAgICBbTUlNRVR5cGVzIGFkZE9iamVjdDptaW1lVHlw ZXNbaV0udHlwZV07CisgICAgfQogICAgIAogICAgIC8vIFJlZ2lzdGVyIHBsdWctaW4gdmlld3Mg YW5kIHJlcHJlc2VudGF0aW9ucy4KICAgICBOU0VudW1lcmF0b3IgKk1JTUVFbnVtZXJhdG9yID0g W01JTUVUeXBlcyBvYmplY3RFbnVtZXJhdG9yXTsKQEAgLTQzOSw5ICs0NDQsOSBAQCAtICh2b2lk KV9yZW1vdmVQbHVnaW46KFdlYkJhc2VQbHVnaW5QYWNrCiAgICAgQVNTRVJUKHBsdWdpbik7CiAK ICAgICAvLyBVbnJlZ2lzdGVyIHBsdWctaW4ncyBNSU1FIHR5cGUgcmVnaXN0cmF0aW9ucwotICAg IE5TQXJyYXkgKk1JTUVUeXBlcyA9IFtwbHVnaW4gTUlNRVR5cGVzXTsKLSAgICBmb3IgKE5TVUlu dGVnZXIgaSA9IDA7IGkgPCBbTUlNRVR5cGVzIGNvdW50XTsgKytpKSB7Ci0gICAgICAgIE5TU3Ry aW5nICpNSU1FVHlwZSA9IFtNSU1FVHlwZXMgb2JqZWN0QXRJbmRleDppXTsKKyAgICBjb25zdCBW ZWN0b3I8TWltZUNsYXNzSW5mbz4mIG1pbWVUeXBlcyA9IFtwbHVnaW4gbWltZVR5cGVzXTsKKyAg ICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1pbWVUeXBlcy5zaXplKCk7ICsraSkgeworICAgICAg ICBOU1N0cmluZyAqTUlNRVR5cGUgPSBtaW1lVHlwZXNbaV0udHlwZTsKIAogICAgICAgICBpZiAo W3JlZ2lzdGVyZWRNSU1FVHlwZXMgY29udGFpbnNPYmplY3Q6TUlNRVR5cGVdKSB7CiAgICAgICAg ICAgICBpZiAoc2VsZiA9PSBzaGFyZWREYXRhYmFzZSkK