40897 2010-06-20 19:21:36 -0700 Get rid of the extensionToMIME mapping in WebBasePluginPackage 2010-06-20 20:25:13 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca abarth eric webkit.review.bot oldest_to_newest 240564 0 andersca 2010-06-20 19:21:36 -0700 Get rid of the extensionToMIME mapping in WebBasePluginPackage 240565 1 59223 andersca 2010-06-20 19:23:38 -0700 Created attachment 59223 Patch 240566 2 59223 mitz 2010-06-20 19:30:39 -0700 Comment on attachment 59223 Patch > + for (size_t i = 0; i < mimeTypes.size(); ++i) { > + const MimeClassInfo& mimeClassInfo = mimeTypes[i]; > + > + for (size_t i = 0; i < mimeClassInfo.extensions.size(); ++i) { Please don’t reuse the outer loop’s index variable. > +- (NSString *)MIMETypeForExtension:(const String&)extension > { > - return [extensionToMIME objectForKey:extension]; > + ASSERT(extension.lower() == extension); > + > + for (size_t i = 0; i < mimeTypes.size(); ++i) { > + const MimeClassInfo& mimeClassInfo = mimeTypes[i]; > + > + for (size_t i = 0; i < mimeClassInfo.extensions.size(); ++i) { Diito. … > + return NO; I doubt that clang++ would allow returning NO from an (NSString *) method. Please return nil. 240567 3 andersca 2010-06-20 19:35:06 -0700 Committed r61523: <http://trac.webkit.org/changeset/61523> 240575 4 webkit.review.bot 2010-06-20 20:12:03 -0700 http://trac.webkit.org/changeset/61523 might have broken SnowLeopard Intel Release (Tests) 240577 5 abarth 2010-06-20 20:25:13 -0700 Looks like a real failure... Tests that caused the DumpRenderTree tool to crash: compositing/geometry/object-clip-rects-assertion.html stderr dom/html/level2/html/AppletsCollection.html stderr fast/dom/object-embed-plugin-scripting.html stderr plugins/embed-attributes-setting.html expected 59223 2010-06-20 19:23:38 -0700 2010-06-20 19:30:39 -0700 Patch bug-40897-20100620192337.patch text/plain 5128 andersca SW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hh bmdlTG9nCShyZXZpc2lvbiA2MTUyMikKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTAtMDYtMjAgIEFuZGVycyBDYXJsc3NvbiAgPGFu ZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBHZXQgcmlkIG9mIHRoZSBleHRlbnNpb25Ub01JTUUgbWFwcGluZyBpbiBXZWJC YXNlUGx1Z2luUGFja2FnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NDA4OTcKKworICAgICAgICBJbnN0ZWFkIG9mIHVzaW5nIHRoZSBleHRlbnNpb25U b01JTUUgbXV0YWJsZSBkaWN0aW9uYXJ5LCB1c2UgdGhlIE1JTUUgdHlwZXMgdmVjdG9yLgorICAg ICAgICBXaGlsZSB0aGlzIG1ha2VzIGxvb2t1cCBvZiBNSU1FIHR5cGVzIGJhc2VkIG9uIGV4dGVu c2lvbnMgbGluZWFyIGluc3RlYWQgb2YgY29uc3RhbnQsCisgICAgICAgIHRoZSBudW1iZXIgb2Yg ZXh0ZW5zaW9ucyBwZXIgcGx1Zy1pbiBpcyB0b28gc21hbGwgZm9yIGl0IHRvIG1hdHRlci4KKwor ICAgICAgICAqIFBsdWdpbnMvV2ViQmFzZVBsdWdpblBhY2thZ2UuaDoKKyAgICAgICAgKiBQbHVn aW5zL1dlYkJhc2VQbHVnaW5QYWNrYWdlLm1tOgorICAgICAgICAoLVtXZWJCYXNlUGx1Z2luUGFj a2FnZSBpbml0V2l0aFBhdGg6XSk6CisgICAgICAgICgtW1dlYkJhc2VQbHVnaW5QYWNrYWdlIGRl YWxsb2NdKToKKyAgICAgICAgKC1bV2ViQmFzZVBsdWdpblBhY2thZ2Ugc3VwcG9ydHNFeHRlbnNp b246XSk6CisgICAgICAgICgtW1dlYkJhc2VQbHVnaW5QYWNrYWdlIE1JTUVUeXBlRm9yRXh0ZW5z aW9uOl0pOgorICAgICAgICAoLVtXZWJCYXNlUGx1Z2luUGFja2FnZSBzZXRNSU1FVG9FeHRlbnNp b25zRGljdGlvbmFyeTpdKToKKwogMjAxMC0wNi0yMCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJz Y2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhbiBCZXJuc3RlaW4uCkluZGV4 OiBXZWJLaXQvbWFjL1BsdWdpbnMvV2ViQmFzZVBsdWdpblBhY2thZ2UuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJLaXQvbWFjL1BsdWdpbnMvV2ViQmFzZVBsdWdpblBhY2thZ2UuaAkocmV2aXNpb24gNjE1 MjIpCisrKyBXZWJLaXQvbWFjL1BsdWdpbnMvV2ViQmFzZVBsdWdpblBhY2thZ2UuaAkod29ya2lu ZyBjb3B5KQpAQCAtNjYsNyArNjYsNiBAQCBAaW50ZXJmYWNlIFdlYkJhc2VQbHVnaW5QYWNrYWdl IDogTlNPYmplCiAKICAgICBOU0RpY3Rpb25hcnkgKk1JTUVUb0Rlc2NyaXB0aW9uOwogICAgIE5T RGljdGlvbmFyeSAqTUlNRVRvRXh0ZW5zaW9uczsKLSAgICBOU011dGFibGVEaWN0aW9uYXJ5ICpl eHRlbnNpb25Ub01JTUU7CiAgICAgCiAgICAgQlBfQ3JlYXRlUGx1Z2luTUlNRVR5cGVzUHJlZmVy ZW5jZXNGdW5jUHRyIEJQX0NyZWF0ZVBsdWdpbk1JTUVUeXBlc1ByZWZlcmVuY2VzOwogfQpAQCAt ODgsMTMgKzg3LDEzIEBAIEBpbnRlcmZhY2UgV2ViQmFzZVBsdWdpblBhY2thZ2UgOiBOU09iamUK IAogLSAoV2ViQ29yZTo6U3RyaW5nKWJ1bmRsZUlkZW50aWZpZXI7CiAKLS0gKEJPT0wpc3VwcG9y dHNFeHRlbnNpb246KE5TU3RyaW5nICopZXh0ZW5zaW9uOworLSAoQk9PTClzdXBwb3J0c0V4dGVu c2lvbjooY29uc3QgV2ViQ29yZTo6U3RyaW5nJilleHRlbnNpb247CiAtIChCT09MKXN1cHBvcnRz TUlNRVR5cGU6KE5TU3RyaW5nICopTUlNRVR5cGU7CiAKIC0gKE5TQXJyYXkgKilNSU1FVHlwZXM7 CiAKIC0gKE5TU3RyaW5nICopZGVzY3JpcHRpb25Gb3JNSU1FVHlwZTooTlNTdHJpbmcgKilNSU1F VHlwZTsKLS0gKE5TU3RyaW5nICopTUlNRVR5cGVGb3JFeHRlbnNpb246KE5TU3RyaW5nICopZXh0 ZW5zaW9uOworLSAoTlNTdHJpbmcgKilNSU1FVHlwZUZvckV4dGVuc2lvbjooY29uc3QgV2ViQ29y ZTo6U3RyaW5nJilleHRlbnNpb247CiAtIChOU0FycmF5ICopZXh0ZW5zaW9uc0Zvck1JTUVUeXBl OihOU1N0cmluZyAqKU1JTUVUeXBlOwogCiAtICh2b2lkKXNldE1JTUVUb0Rlc2NyaXB0aW9uRGlj dGlvbmFyeTooTlNEaWN0aW9uYXJ5ICopTUlNRVRvRGVzY3JpcHRpb25EaWN0aW9uYXJ5OwpJbmRl eDogV2ViS2l0L21hYy9QbHVnaW5zL1dlYkJhc2VQbHVnaW5QYWNrYWdlLm1tCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdC9tYWMvUGx1Z2lucy9XZWJCYXNlUGx1Z2luUGFja2FnZS5tbQkocmV2aXNpb24g NjE1MjIpCisrKyBXZWJLaXQvbWFjL1BsdWdpbnMvV2ViQmFzZVBsdWdpblBhY2thZ2UubW0JKHdv cmtpbmcgY29weSkKQEAgLTEzMyw3ICsxMzMsNiBAQCAtIChpZClpbml0V2l0aFBhdGg6KE5TU3Ry aW5nICopcGx1Z2luUGF0CiAgICAgICAgIHJldHVybiBuaWw7CiAgICAgfQogI2VuZGlmCi0gICAg ZXh0ZW5zaW9uVG9NSU1FID0gW1tOU011dGFibGVEaWN0aW9uYXJ5IGFsbG9jXSBpbml0XTsKICAg ICAKICAgICByZXR1cm4gc2VsZjsKIH0KQEAgLTI3Nyw3ICsyNzYsNiBAQCAtICh2b2lkKWRlYWxs b2MKICAgICAKICAgICBbTUlNRVRvRGVzY3JpcHRpb24gcmVsZWFzZV07CiAgICAgW01JTUVUb0V4 dGVuc2lvbnMgcmVsZWFzZV07Ci0gICAgW2V4dGVuc2lvblRvTUlNRSByZWxlYXNlXTsKIAogICAg IGlmIChjZkJ1bmRsZSkKICAgICAgICAgQ0ZSZWxlYXNlKGNmQnVuZGxlKTsKQEAgLTMyNyw5ICsz MjUsMjAgQEAgLSAoTlNBcnJheSAqKU1JTUVUeXBlcwogICAgIHJldHVybiBbTUlNRVRvRXh0ZW5z aW9ucyBhbGxLZXlzXTsKIH0KIAotLSAoQk9PTClzdXBwb3J0c0V4dGVuc2lvbjooTlNTdHJpbmcg KilleHRlbnNpb24KKy0gKEJPT0wpc3VwcG9ydHNFeHRlbnNpb246KGNvbnN0IFN0cmluZyYpZXh0 ZW5zaW9uCiB7Ci0gICAgcmV0dXJuIFtleHRlbnNpb25Ub01JTUUgb2JqZWN0Rm9yS2V5OmV4dGVu c2lvbl0gIT0gMDsKKyAgICBBU1NFUlQoZXh0ZW5zaW9uLmxvd2VyKCkgPT0gZXh0ZW5zaW9uKTsK KyAgICAKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1pbWVUeXBlcy5zaXplKCk7ICsraSkg eworICAgICAgICBjb25zdCBNaW1lQ2xhc3NJbmZvJiBtaW1lQ2xhc3NJbmZvID0gbWltZVR5cGVz W2ldOworICAgICAgICAKKyAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtaW1lQ2xhc3NJ bmZvLmV4dGVuc2lvbnMuc2l6ZSgpOyArK2kpIHsKKyAgICAgICAgICAgIGlmIChtaW1lQ2xhc3NJ bmZvLmV4dGVuc2lvbnNbaV0gPT0gZXh0ZW5zaW9uKQorICAgICAgICAgICAgICAgIHJldHVybiBZ RVM7CisgICAgICAgIH0KKyAgICB9CisKKyAgICByZXR1cm4gTk87CiB9CiAKIC0gKEJPT0wpc3Vw cG9ydHNNSU1FVHlwZTooTlNTdHJpbmcgKilNSU1FVHlwZQpAQCAtMzQyLDkgKzM1MSwyMCBAQCAt IChOU1N0cmluZyAqKWRlc2NyaXB0aW9uRm9yTUlNRVR5cGU6KE5TCiAgICAgcmV0dXJuIFtNSU1F VG9EZXNjcmlwdGlvbiBvYmplY3RGb3JLZXk6TUlNRVR5cGVdOwogfQogCi0tIChOU1N0cmluZyAq KU1JTUVUeXBlRm9yRXh0ZW5zaW9uOihOU1N0cmluZyAqKWV4dGVuc2lvbgorLSAoTlNTdHJpbmcg KilNSU1FVHlwZUZvckV4dGVuc2lvbjooY29uc3QgU3RyaW5nJilleHRlbnNpb24KIHsKLSAgICBy ZXR1cm4gW2V4dGVuc2lvblRvTUlNRSBvYmplY3RGb3JLZXk6ZXh0ZW5zaW9uXTsKKyAgICBBU1NF UlQoZXh0ZW5zaW9uLmxvd2VyKCkgPT0gZXh0ZW5zaW9uKTsKKyAgICAKKyAgICBmb3IgKHNpemVf dCBpID0gMDsgaSA8IG1pbWVUeXBlcy5zaXplKCk7ICsraSkgeworICAgICAgICBjb25zdCBNaW1l Q2xhc3NJbmZvJiBtaW1lQ2xhc3NJbmZvID0gbWltZVR5cGVzW2ldOworICAgICAgICAKKyAgICAg ICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtaW1lQ2xhc3NJbmZvLmV4dGVuc2lvbnMuc2l6ZSgp OyArK2kpIHsKKyAgICAgICAgICAgIGlmIChtaW1lQ2xhc3NJbmZvLmV4dGVuc2lvbnNbaV0gPT0g ZXh0ZW5zaW9uKQorICAgICAgICAgICAgICAgIHJldHVybiBtaW1lQ2xhc3NJbmZvLnR5cGU7Cisg ICAgICAgIH0KKyAgICB9CisKKyAgICByZXR1cm4gTk87CiB9CiAKIC0gKE5TQXJyYXkgKilleHRl bnNpb25zRm9yTUlNRVR5cGU6KE5TU3RyaW5nICopTUlNRVR5cGUKQEAgLTM2MiwyMyArMzgyLDYg QEAgLSAodm9pZClzZXRNSU1FVG9FeHRlbnNpb25zRGljdGlvbmFyeTooTgogewogICAgIFtNSU1F VG9FeHRlbnNpb25zIHJlbGVhc2VdOwogICAgIE1JTUVUb0V4dGVuc2lvbnMgPSBbTUlNRVRvRXh0 ZW5zaW9uc0RpY3Rpb25hcnkgcmV0YWluXTsKLQotICAgIC8vIFJldmVyc2UgdGhlIG1hcHBpbmcK LSAgICBbZXh0ZW5zaW9uVG9NSU1FIHJlbW92ZUFsbE9iamVjdHNdOwotCi0gICAgTlNFbnVtZXJh dG9yICpNSU1FRW51bWVyYXRvciA9IFtNSU1FVG9FeHRlbnNpb25zIGtleUVudW1lcmF0b3JdLCAq ZXh0ZW5zaW9uRW51bWVyYXRvcjsKLSAgICBOU1N0cmluZyAqTUlNRSwgKmV4dGVuc2lvbjsKLSAg ICBOU0FycmF5ICpleHRlbnNpb25zOwotICAgIAotICAgIHdoaWxlICgoTUlNRSA9IFtNSU1FRW51 bWVyYXRvciBuZXh0T2JqZWN0XSkgIT0gbmlsKSB7Ci0gICAgICAgIGV4dGVuc2lvbnMgPSBbTUlN RVRvRXh0ZW5zaW9ucyBvYmplY3RGb3JLZXk6TUlNRV07Ci0gICAgICAgIGV4dGVuc2lvbkVudW1l cmF0b3IgPSBbZXh0ZW5zaW9ucyBvYmplY3RFbnVtZXJhdG9yXTsKLQotICAgICAgICB3aGlsZSAo KGV4dGVuc2lvbiA9IFtleHRlbnNpb25FbnVtZXJhdG9yIG5leHRPYmplY3RdKSAhPSBuaWwpIHsK LSAgICAgICAgICAgIGlmICghW2V4dGVuc2lvbiBpc0VxdWFsVG9TdHJpbmc6QCIiXSkKLSAgICAg ICAgICAgICAgICBbZXh0ZW5zaW9uVG9NSU1FIHNldE9iamVjdDpNSU1FIGZvcktleTpleHRlbnNp b25dOwotICAgICAgICB9Ci0gICAgfQogfQogCiAtIChOU1N0cmluZyAqKWRlc2NyaXB0aW9uCg==