57205 2011-03-27 22:56:20 -0700 Correctly get a plug-in's MIME type when it uses WebPluginMIMETypesFilename 2011-03-27 23:41:59 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 57204 1 aestes aestes oldest_to_newest 374286 0 aestes 2011-03-27 22:56:20 -0700 Correctly get a plug-in's MIME type when it uses WebPluginMIMETypesFilename 374287 1 aestes 2011-03-27 22:57:12 -0700 <rdar://problem/9162945> 374290 2 aestes 2011-03-27 23:04:35 -0700 <https://bugs.webkit.org/show_bug.cgi?id=57204> is a necessary follow-on to this. That bug tracks having the plug-in create the file referenced by WebPluginMIMETypesFilename if it doesn't exist. 374291 3 87102 aestes 2011-03-27 23:06:30 -0700 Created attachment 87102 Patch 374293 4 87102 mjs 2011-03-27 23:32:46 -0700 Comment on attachment 87102 Patch r=me 374298 5 aestes 2011-03-27 23:41:59 -0700 Committed r82087: <http://trac.webkit.org/changeset/82087> 87102 2011-03-27 23:06:30 -0700 2011-03-27 23:32:46 -0700 Patch bug-57205-20110327230629.patch text/plain 4671 aestes SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDgyMDg1KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDMtMjcgIEFuZHkgRXN0 ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIENvcnJlY3RseSBnZXQgYSBwbHVnLWluJ3MgTUlNRSB0eXBlIHdoZW4g aXQgdXNlcyBXZWJQbHVnaW5NSU1FVHlwZXNGaWxlbmFtZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTcyMDUKKyAgICAgICAgCisgICAgICAgIElmIHRo ZSBwbHVnLWluJ3MgSW5mby5wbGlzdCB1c2VzIFdlYlBsdWdpbk1JTUVUeXBlc0ZpbGVuYW1lIHRv IHNwZWNpZnkKKyAgICAgICAgcGx1Zy1pbiBNSU1FIHR5cGVzLCBXZWJLaXQgaGFzIHRvIGNoZWNr IGZvciBhIHByb3BlcnR5IGxpc3QgZmlsZSBpbgorICAgICAgICB+L0xpYnJhcnkvUHJlZmVyZW5j ZXMgZm9yIHRoZSBNSU1FIHR5cGUgZGljdGlvbmFyeS4KKworICAgICAgICAqIFNoYXJlZC9QbHVn aW5zL05ldHNjYXBlL21hYy9OZXRzY2FwZVBsdWdpbk1vZHVsZU1hYy5tbToKKyAgICAgICAgKFdl YktpdDo6Z2V0TUlNRVR5cGVzRnJvbVBsdWdpbkJ1bmRsZSk6IElmIHRoZSBidW5kbGUncyBJbmZv IGRpY3Rpb25hcnkKKyAgICAgICAgaGFzIHRoZSBrZXkgV2ViUGx1Z2luTUlNRVR5cGVzRmlsZW5h bWUsIG9wZW4gdGhlIHByb3BlcnR5IGxpc3QKKyAgICAgICAgc3BlY2lmaWVkIGJ5IHRoYXQga2V5 J3MgdmFsdWUgYW5kIHJldHVybiB0aGUgTUlNRSB0eXBlIGRpY3Rpb25hcnkgZnJvbQorICAgICAg ICB0aGVyZS4gT3RoZXJ3aXNlLCByZXR1cm4gdGhlIE1JTUUgdHlwZSBkaWN0aW9uYXJ5IHNwZWNp ZmllZCBieSB0aGUga2V5CisgICAgICAgIFdlYlBsdWdpbk1JTUVUeXBlcy4KKyAgICAgICAgKFdl YktpdDo6Z2V0UGx1Z2luSW5mb0Zyb21Qcm9wZXJ0eUxpc3RzKTogQ2FsbAorICAgICAgICBnZXRN SU1FVHlwZXNGcm9tUGx1Z2luQnVuZGxlKCkuCisKIDIwMTEtMDMtMjcgIEplciBOb2JsZSAgPGpl ci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTWFjaWVqIFN0YWNob3dp YWsuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9OZXRzY2FwZS9tYWMvTmV0 c2NhcGVQbHVnaW5Nb2R1bGVNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hh cmVkL1BsdWdpbnMvTmV0c2NhcGUvbWFjL05ldHNjYXBlUGx1Z2luTW9kdWxlTWFjLm1tCShyZXZp c2lvbiA4MjAwMykKKysrIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05ldHNjYXBlL21h Yy9OZXRzY2FwZVBsdWdpbk1vZHVsZU1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtODYsMTMgKzg2 LDM1IEBAIHN0YXRpYyBib29sIGdldFBsdWdpbkFyY2hpdGVjdHVyZShDRkJ1bmQKIAogICAgIHJl dHVybiBmYWxzZTsKIH0KKyAgICAKK3N0YXRpYyBSZXRhaW5QdHI8Q0ZEaWN0aW9uYXJ5UmVmPiBn ZXRNSU1FVHlwZXNGcm9tUGx1Z2luQnVuZGxlKENGQnVuZGxlUmVmIGJ1bmRsZSkKK3sKKyAgICBD RlN0cmluZ1JlZiBwcm9wZXJ0eUxpc3RGaWxlbmFtZSA9IHN0YXRpY19jYXN0PENGU3RyaW5nUmVm PihDRkJ1bmRsZUdldFZhbHVlRm9ySW5mb0RpY3Rpb25hcnlLZXkoYnVuZGxlLCBDRlNUUigiV2Vi UGx1Z2luTUlNRVR5cGVzRmlsZW5hbWUiKSkpOworICAgIGlmIChwcm9wZXJ0eUxpc3RGaWxlbmFt ZSkgeworICAgICAgICBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IHByb3BlcnR5TGlzdFBhdGgoQWRv cHRDRiwgQ0ZTdHJpbmdDcmVhdGVXaXRoRm9ybWF0KGtDRkFsbG9jYXRvckRlZmF1bHQsIDAsIENG U1RSKCIlQC9MaWJyYXJ5L1ByZWZlcmVuY2VzLyVAIiksIE5TSG9tZURpcmVjdG9yeSgpLCBwcm9w ZXJ0eUxpc3RGaWxlbmFtZSkpOworICAgICAgICBSZXRhaW5QdHI8Q0ZVUkxSZWY+IHByb3BlcnR5 TGlzdFVSTChBZG9wdENGLCBDRlVSTENyZWF0ZVdpdGhGaWxlU3lzdGVtUGF0aChrQ0ZBbGxvY2F0 b3JEZWZhdWx0LCBwcm9wZXJ0eUxpc3RQYXRoLmdldCgpLCBrQ0ZVUkxQT1NJWFBhdGhTdHlsZSwg RkFMU0UpKTsKKworICAgICAgICBDRkRhdGFSZWYgcHJvcGVydHlMaXN0RGF0YTsKKyAgICAgICAg Q0ZVUkxDcmVhdGVEYXRhQW5kUHJvcGVydGllc0Zyb21SZXNvdXJjZShrQ0ZBbGxvY2F0b3JEZWZh dWx0LCBwcm9wZXJ0eUxpc3RVUkwuZ2V0KCksICZwcm9wZXJ0eUxpc3REYXRhLCAwLCAwLCAwKTsK KyAgICAgICAgUmV0YWluUHRyPENGUHJvcGVydHlMaXN0UmVmPiBwcm9wZXJ0eUxpc3QoQWRvcHRD RiwgQ0ZQcm9wZXJ0eUxpc3RDcmVhdGVXaXRoRGF0YShrQ0ZBbGxvY2F0b3JEZWZhdWx0LCBwcm9w ZXJ0eUxpc3REYXRhLCBrQ0ZQcm9wZXJ0eUxpc3RJbW11dGFibGUsIDAsIDApKTsKKyAgICAgICAg aWYgKHByb3BlcnR5TGlzdERhdGEpCisgICAgICAgICAgICBDRlJlbGVhc2UocHJvcGVydHlMaXN0 RGF0YSk7CisgICAgICAgIAorICAgICAgICAvLyBGSVhNRTogSGF2ZSB0aGUgcGx1Zy1pbiBjcmVh dGUgdGhlIE1JTUUgdHlwZXMgcHJvcGVydHkgbGlzdCBpZiBpdCBkb2Vzbid0IGV4aXN0LgorICAg ICAgICAvLyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTcyMDQKKyAg ICAgICAgaWYgKCFwcm9wZXJ0eUxpc3QgfHwgQ0ZHZXRUeXBlSUQocHJvcGVydHlMaXN0LmdldCgp KSAhPSBDRkRpY3Rpb25hcnlHZXRUeXBlSUQoKSkKKyAgICAgICAgICAgIHJldHVybiAwOworICAg ICAgICAKKyAgICAgICAgcmV0dXJuIHN0YXRpY19jYXN0PENGRGljdGlvbmFyeVJlZj4oQ0ZEaWN0 aW9uYXJ5R2V0VmFsdWUoc3RhdGljX2Nhc3Q8Q0ZEaWN0aW9uYXJ5UmVmPihwcm9wZXJ0eUxpc3Qu Z2V0KCkpLCBDRlNUUigiV2ViUGx1Z2luTUlNRVR5cGVzIikpKTsKKyAgICB9CisgICAgCisgICAg cmV0dXJuIHN0YXRpY19jYXN0PENGRGljdGlvbmFyeVJlZj4oQ0ZCdW5kbGVHZXRWYWx1ZUZvcklu Zm9EaWN0aW9uYXJ5S2V5KGJ1bmRsZSwgQ0ZTVFIoIldlYlBsdWdpbk1JTUVUeXBlcyIpKSk7Cit9 CiAKIHN0YXRpYyBib29sIGdldFBsdWdpbkluZm9Gcm9tUHJvcGVydHlMaXN0cyhDRkJ1bmRsZVJl ZiBidW5kbGUsIFBsdWdpbkluZm8mIHBsdWdpbkluZm8pCiB7Ci0gICAgLy8gRklYTUU6IEhhbmRs ZSBXZWJQbHVnaW5NSU1FVHlwZXNGaWxlbmFtZUtleS4KLSAgICAKLSAgICBDRkRpY3Rpb25hcnlS ZWYgbWltZVR5cGVzID0gc3RhdGljX2Nhc3Q8Q0ZEaWN0aW9uYXJ5UmVmPihDRkJ1bmRsZUdldFZh bHVlRm9ySW5mb0RpY3Rpb25hcnlLZXkoYnVuZGxlLCBDRlNUUigiV2ViUGx1Z2luTUlNRVR5cGVz IikpKTsKLSAgICBpZiAoIW1pbWVUeXBlcyB8fCBDRkdldFR5cGVJRChtaW1lVHlwZXMpICE9IENG RGljdGlvbmFyeUdldFR5cGVJRCgpKQorICAgIFJldGFpblB0cjxDRkRpY3Rpb25hcnlSZWY+IG1p bWVUeXBlcyA9IGdldE1JTUVUeXBlc0Zyb21QbHVnaW5CdW5kbGUoYnVuZGxlKTsKKyAgICBpZiAo IW1pbWVUeXBlcyB8fCBDRkdldFR5cGVJRChtaW1lVHlwZXMuZ2V0KCkpICE9IENGRGljdGlvbmFy eUdldFR5cGVJRCgpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICAvLyBHZXQgdGhlIHBs dWctaW4gbmFtZS4KQEAgLTEwNiwxMCArMTI4LDEwIEBAIHN0YXRpYyBib29sIGdldFBsdWdpbklu Zm9Gcm9tUHJvcGVydHlMaXMKICAgICAgICAgcGx1Z2luSW5mby5kZXNjID0gcGx1Z2luRGVzY3Jp cHRpb247CiAgICAgCiAgICAgLy8gR2V0IHRoZSBNSU1FIHR5cGUgbWFwcGluZyBkaWN0aW9uYXJ5 LgotICAgIENGSW5kZXggbnVtTWltZVR5cGVzID0gQ0ZEaWN0aW9uYXJ5R2V0Q291bnQobWltZVR5 cGVzKTsKKyAgICBDRkluZGV4IG51bU1pbWVUeXBlcyA9IENGRGljdGlvbmFyeUdldENvdW50KG1p bWVUeXBlcy5nZXQoKSk7ICAgICAgICAgIAogICAgIFZlY3RvcjxDRlN0cmluZ1JlZj4gbWltZVR5 cGVzVmVjdG9yKG51bU1pbWVUeXBlcyk7CiAgICAgVmVjdG9yPENGRGljdGlvbmFyeVJlZj4gbWlt ZVR5cGVJbmZvVmVjdG9yKG51bU1pbWVUeXBlcyk7Ci0gICAgQ0ZEaWN0aW9uYXJ5R2V0S2V5c0Fu ZFZhbHVlcyhtaW1lVHlwZXMsIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3Qgdm9pZCoqPihtaW1lVHlw ZXNWZWN0b3IuZGF0YSgpKSwgcmVpbnRlcnByZXRfY2FzdDxjb25zdCB2b2lkKio+KG1pbWVUeXBl SW5mb1ZlY3Rvci5kYXRhKCkpKTsKKyAgICBDRkRpY3Rpb25hcnlHZXRLZXlzQW5kVmFsdWVzKG1p bWVUeXBlcy5nZXQoKSwgcmVpbnRlcnByZXRfY2FzdDxjb25zdCB2b2lkKio+KG1pbWVUeXBlc1Zl Y3Rvci5kYXRhKCkpLCByZWludGVycHJldF9jYXN0PGNvbnN0IHZvaWQqKj4obWltZVR5cGVJbmZv VmVjdG9yLmRhdGEoKSkpOwogICAgIAogICAgIGZvciAoQ0ZJbmRleCBpID0gMDsgaSA8IG51bU1p bWVUeXBlczsgKytpKSB7CiAgICAgICAgIE1pbWVDbGFzc0luZm8gbWltZUNsYXNzSW5mbzsK