60486 2011-05-09 11:35:22 -0700 Clean up NetscapePluginModule::getPluginInfo 2011-05-09 12:07:47 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 400605 0 andersca 2011-05-09 11:35:22 -0700 Clean up NetscapePluginModule::getPluginInfo 400606 1 92812 andersca 2011-05-09 11:36:00 -0700 Created attachment 92812 Patch 400626 2 92812 sullivan 2011-05-09 11:58:43 -0700 Comment on attachment 92812 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=92812&action=review > Source/WebKit2/ChangeLog:13 > + This change could use a little justification in the form of ChangeLog comments. 400638 3 andersca 2011-05-09 12:07:47 -0700 Committed r86076: <http://trac.webkit.org/changeset/86076> 92812 2011-05-09 11:36:00 -0700 2011-05-09 11:58:42 -0700 Patch bug-60486-20110509113559.patch text/plain 6828 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg2MDcyKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDUtMDkgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBDbGVhbiB1cCBOZXRzY2FwZVBsdWdpbk1vZHVsZTo6Z2V0 UGx1Z2luSW5mbworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NjA0ODYKKworICAgICAgICAqIFNoYXJlZC9QbHVnaW5zL05ldHNjYXBlL21hYy9OZXRzY2Fw ZVBsdWdpbk1vZHVsZU1hYy5tbToKKyAgICAgICAgKFdlYktpdDo6Z2V0UGx1Z2luQXJjaGl0ZWN0 dXJlKToKKyAgICAgICAgKFdlYktpdDo6Z2V0UGx1Z2luSW5mb0Zyb21Qcm9wZXJ0eUxpc3RzKToK KyAgICAgICAgKFdlYktpdDo6Z2V0UGx1Z2luSW5mb0Zyb21DYXJib25SZXNvdXJjZXMpOgorICAg ICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbk1vZHVsZTo6Z2V0UGx1Z2luSW5mbyk6CisKIDIw MTEtMDUtMDkgIEJlbmphbWluIFBvdWxhaW4gIDxiZW5qYW1pbi5wb3VsYWluQG5va2lhLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBBbmRyZWFzIEtsaW5nLgpJbmRleDogU291cmNlL1dlYktp dDIvU2hhcmVkL1BsdWdpbnMvTmV0c2NhcGUvbWFjL05ldHNjYXBlUGx1Z2luTW9kdWxlTWFjLm1t Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9QbHVnaW5zL05ldHNjYXBlL21h Yy9OZXRzY2FwZVBsdWdpbk1vZHVsZU1hYy5tbQkocmV2aXNpb24gODYwNjEpCisrKyBTb3VyY2Uv V2ViS2l0Mi9TaGFyZWQvUGx1Z2lucy9OZXRzY2FwZS9tYWMvTmV0c2NhcGVQbHVnaW5Nb2R1bGVN YWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTMzLDcgKzMzLDcgQEAgdXNpbmcgbmFtZXNwYWNlIFdl YkNvcmU7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi1zdGF0aWMgYm9vbCBnZXRQbHVnaW5BcmNo aXRlY3R1cmUoQ0ZCdW5kbGVSZWYgYnVuZGxlLCBjcHVfdHlwZV90JiBwbHVnaW5BcmNoaXRlY3R1 cmUpCitzdGF0aWMgYm9vbCBnZXRQbHVnaW5BcmNoaXRlY3R1cmUoQ0ZCdW5kbGVSZWYgYnVuZGxl LCBQbHVnaW5JbmZvU3RvcmU6OlBsdWdpbiYgcGx1Z2luKQogewogICAgIFJldGFpblB0cjxDRkFy cmF5UmVmPiBwbHVnaW5BcmNoaXRlY3R1cmVzQXJyYXkoQWRvcHRDRiwgQ0ZCdW5kbGVDb3B5RXhl Y3V0YWJsZUFyY2hpdGVjdHVyZXMoYnVuZGxlKSk7CiAgICAgaWYgKCFwbHVnaW5BcmNoaXRlY3R1 cmVzQXJyYXkpCkBAIC01MywzMSArNTMsMzEgQEAgc3RhdGljIGJvb2wgZ2V0UGx1Z2luQXJjaGl0 ZWN0dXJlKENGQnVuZAogI2lmZGVmIF9feDg2XzY0X18KICAgICAvLyBXZSBvbmx5IHN1cHBvcnQg NjQtYml0IEludGVsIHBsdWctaW5zIG9uIDY0LWJpdCBJbnRlbC4KICAgICBpZiAoYXJjaGl0ZWN0 dXJlcy5jb250YWlucyhrQ0ZCdW5kbGVFeGVjdXRhYmxlQXJjaGl0ZWN0dXJlWDg2XzY0KSkgewot ICAgICAgICBwbHVnaW5BcmNoaXRlY3R1cmUgPSBDUFVfVFlQRV9YODZfNjQ7CisgICAgICAgIHBs dWdpbi5wbHVnaW5BcmNoaXRlY3R1cmUgPSBDUFVfVFlQRV9YODZfNjQ7CiAgICAgICAgIHJldHVy biB0cnVlOwogICAgIH0KIAogICAgIC8vIFdlIGFsc28gc3VwcG9ydCAzMi1iaXQgSW50ZWwgcGx1 Zy1pbnMgb24gNjQtYml0IEludGVsLgogICAgIGlmIChhcmNoaXRlY3R1cmVzLmNvbnRhaW5zKGtD RkJ1bmRsZUV4ZWN1dGFibGVBcmNoaXRlY3R1cmVJMzg2KSkgewotICAgICAgICBwbHVnaW5BcmNo aXRlY3R1cmUgPSBDUFVfVFlQRV9YODY7CisgICAgICAgIHBsdWdpbi5wbHVnaW5BcmNoaXRlY3R1 cmUgPSBDUFVfVFlQRV9YODY7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0KICNlbGlmIGRl ZmluZWQoX19pMzg2X18pCiAgICAgLy8gV2Ugb25seSBzdXBwb3J0IDMyLWJpdCBJbnRlbCBwbHVn LWlucyBvbiAzMi1iaXQgSW50ZWwuCiAgICAgaWYgKGFyY2hpdGVjdHVyZXMuY29udGFpbnMoa0NG QnVuZGxlRXhlY3V0YWJsZUFyY2hpdGVjdHVyZUkzODYpKSB7Ci0gICAgICAgIHBsdWdpbkFyY2hp dGVjdHVyZSA9IENQVV9UWVBFX1g4NjsKKyAgICAgICAgcGx1Z2luLnBsdWdpbkFyY2hpdGVjdHVy ZSA9IENQVV9UWVBFX1g4NjsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQogI2VsaWYgZGVm aW5lZChfX3BwYzY0X18pCiAgICAgLy8gV2Ugb25seSBzdXBwb3J0IDY0LWJpdCBQUEMgcGx1Zy1p bnMgb24gNjQtYml0IFBQQy4KICAgICBpZiAoYXJjaGl0ZWN0dXJlcy5jb250YWlucyhrQ0ZCdW5k bGVFeGVjdXRhYmxlQXJjaGl0ZWN0dXJlUFBDNjQpKSB7Ci0gICAgICAgIHBsdWdpbkFyY2hpdGVj dHVyZSA9IENQVV9UWVBFX1BPV0VSUEM2NDsKKyAgICAgICAgcGx1Z2luLnBsdWdpbkFyY2hpdGVj dHVyZSA9IENQVV9UWVBFX1BPV0VSUEM2NDsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQog I2VsaWYgZGVmaW5lZChfX3BwY19fKQogICAgIC8vIFdlIG9ubHkgc3VwcG9ydCAzMi1iaXQgUFBD IHBsdWctaW5zIG9uIDMyLWJpdCBQUEMuCiAgICAgaWYgKGFyY2hpdGVjdHVyZXMuY29udGFpbnMo a0NGQnVuZGxlRXhlY3V0YWJsZUFyY2hpdGVjdHVyZVBQQykpIHsKLSAgICAgICAgcGx1Z2luQXJj aGl0ZWN0dXJlID0gQ1BVX1RZUEVfUE9XRVJQQzsKKyAgICAgICAgcGx1Z2luLnBsdWdpbkFyY2hp dGVjdHVyZSA9IENQVV9UWVBFX1BPV0VSUEM7CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0K ICNlbHNlCkBAIC0xMTEsNyArMTExLDcgQEAgc3RhdGljIFJldGFpblB0cjxDRkRpY3Rpb25hcnlS ZWY+IGdldE1JTQogICAgIHJldHVybiBzdGF0aWNfY2FzdDxDRkRpY3Rpb25hcnlSZWY+KENGQnVu ZGxlR2V0VmFsdWVGb3JJbmZvRGljdGlvbmFyeUtleShidW5kbGUsIENGU1RSKCJXZWJQbHVnaW5N SU1FVHlwZXMiKSkpOwogfQogCi1zdGF0aWMgYm9vbCBnZXRQbHVnaW5JbmZvRnJvbVByb3BlcnR5 TGlzdHMoQ0ZCdW5kbGVSZWYgYnVuZGxlLCBQbHVnaW5JbmZvJiBwbHVnaW5JbmZvKQorc3RhdGlj IGJvb2wgZ2V0UGx1Z2luSW5mb0Zyb21Qcm9wZXJ0eUxpc3RzKENGQnVuZGxlUmVmIGJ1bmRsZSwg UGx1Z2luSW5mb1N0b3JlOjpQbHVnaW4mIHBsdWdpbikKIHsKICAgICBSZXRhaW5QdHI8Q0ZEaWN0 aW9uYXJ5UmVmPiBtaW1lVHlwZXMgPSBnZXRNSU1FVHlwZXNGcm9tUGx1Z2luQnVuZGxlKGJ1bmRs ZSk7CiAgICAgaWYgKCFtaW1lVHlwZXMgfHwgQ0ZHZXRUeXBlSUQobWltZVR5cGVzLmdldCgpKSAh PSBDRkRpY3Rpb25hcnlHZXRUeXBlSUQoKSkKQEAgLTEyMCwxMiArMTIwLDEyIEBAIHN0YXRpYyBi b29sIGdldFBsdWdpbkluZm9Gcm9tUHJvcGVydHlMaXMKICAgICAvLyBHZXQgdGhlIHBsdWctaW4g bmFtZS4KICAgICBDRlN0cmluZ1JlZiBwbHVnaW5OYW1lID0gc3RhdGljX2Nhc3Q8Q0ZTdHJpbmdS ZWY+KENGQnVuZGxlR2V0VmFsdWVGb3JJbmZvRGljdGlvbmFyeUtleShidW5kbGUsIENGU1RSKCJX ZWJQbHVnaW5OYW1lIikpKTsKICAgICBpZiAocGx1Z2luTmFtZSAmJiBDRkdldFR5cGVJRChwbHVn aW5OYW1lKSA9PSBDRlN0cmluZ0dldFR5cGVJRCgpKQotICAgICAgICBwbHVnaW5JbmZvLm5hbWUg PSBwbHVnaW5OYW1lOworICAgICAgICBwbHVnaW4uaW5mby5uYW1lID0gcGx1Z2luTmFtZTsKICAg ICAKICAgICAvLyBHZXQgdGhlIHBsdWctaW4gZGVzY3JpcHRpb24uCiAgICAgQ0ZTdHJpbmdSZWYg cGx1Z2luRGVzY3JpcHRpb24gPSBzdGF0aWNfY2FzdDxDRlN0cmluZ1JlZj4oQ0ZCdW5kbGVHZXRW YWx1ZUZvckluZm9EaWN0aW9uYXJ5S2V5KGJ1bmRsZSwgQ0ZTVFIoIldlYlBsdWdpbkRlc2NyaXB0 aW9uIikpKTsKICAgICBpZiAocGx1Z2luRGVzY3JpcHRpb24gJiYgQ0ZHZXRUeXBlSUQocGx1Z2lu RGVzY3JpcHRpb24pID09IENGU3RyaW5nR2V0VHlwZUlEKCkpCi0gICAgICAgIHBsdWdpbkluZm8u ZGVzYyA9IHBsdWdpbkRlc2NyaXB0aW9uOworICAgICAgICBwbHVnaW4uaW5mby5kZXNjID0gcGx1 Z2luRGVzY3JpcHRpb247CiAgICAgCiAgICAgLy8gR2V0IHRoZSBNSU1FIHR5cGUgbWFwcGluZyBk aWN0aW9uYXJ5LgogICAgIENGSW5kZXggbnVtTWltZVR5cGVzID0gQ0ZEaWN0aW9uYXJ5R2V0Q291 bnQobWltZVR5cGVzLmdldCgpKTsgICAgICAgICAgCkBAIC0xOTAsNyArMTkwLDcgQEAgc3RhdGlj IGJvb2wgZ2V0UGx1Z2luSW5mb0Zyb21Qcm9wZXJ0eUxpcwogICAgICAgICB9CiAKICAgICAgICAg Ly8gQWRkIHRoaXMgTUlNRSB0eXBlLgotICAgICAgICBwbHVnaW5JbmZvLm1pbWVzLmFwcGVuZCht aW1lQ2xhc3NJbmZvKTsKKyAgICAgICAgcGx1Z2luLmluZm8ubWltZXMuYXBwZW5kKG1pbWVDbGFz c0luZm8pOwogICAgIH0KIAogICAgIHJldHVybiB0cnVlOyAgICAKQEAgLTI2OCw3ICsyNjgsNyBA QCBzdGF0aWMgY29uc3QgUmVzSUQgUGx1Z2luTmFtZU9yRGVzY3JpcHRpCiBzdGF0aWMgY29uc3Qg UmVzSUQgTUlNRURlc2NyaXB0aW9uU3RyaW5nTnVtYmVyID0gMTI3Owogc3RhdGljIGNvbnN0IFJl c0lEIE1JTUVMaXN0U3RyaW5nU3RyaW5nTnVtYmVyID0gMTI4OwogCi1zdGF0aWMgYm9vbCBnZXRQ bHVnaW5JbmZvRnJvbUNhcmJvblJlc291cmNlcyhDRkJ1bmRsZVJlZiBidW5kbGUsIFBsdWdpbklu Zm8mIHBsdWdpbkluZm8pCitzdGF0aWMgYm9vbCBnZXRQbHVnaW5JbmZvRnJvbUNhcmJvblJlc291 cmNlcyhDRkJ1bmRsZVJlZiBidW5kbGUsIFBsdWdpbkluZm9TdG9yZTo6UGx1Z2luJiBwbHVnaW4p CiB7CiAgICAgUmVzb3VyY2VNYXAgcmVzb3VyY2VNYXAoYnVuZGxlKTsKICAgICBpZiAoIXJlc291 cmNlTWFwLmlzVmFsaWQoKSkKQEAgLTMxMCwxNCArMzEwLDE0IEBAIHN0YXRpYyBib29sIGdldFBs dWdpbkluZm9Gcm9tQ2FyYm9uUmVzb3UKICAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBl eHRlbnNpb25zLnNpemUoKTsgKytpKQogICAgICAgICAgICAgbWltZUNsYXNzSW5mby5leHRlbnNp b25zLmFwcGVuZChleHRlbnNpb25zW2ldLmxvd2VyKCkpOwogCi0gICAgICAgIHBsdWdpbkluZm8u bWltZXMuYXBwZW5kKG1pbWVDbGFzc0luZm8pOworICAgICAgICBwbHVnaW4uaW5mby5taW1lcy5h cHBlbmQobWltZUNsYXNzSW5mbyk7CiAgICAgfQogCiAgICAgLy8gU2V0IHRoZSBkZXNjcmlwdGlv biBhbmQgbmFtZSBpZiB0aGV5IGV4aXN0LgogICAgIGlmIChkZXNjcmlwdGlvbkFuZE5hbWUuc2l6 ZSgpID4gMCkKLSAgICAgICAgcGx1Z2luSW5mby5kZXNjID0gZGVzY3JpcHRpb25BbmROYW1lWzBd OworICAgICAgICBwbHVnaW4uaW5mby5kZXNjID0gZGVzY3JpcHRpb25BbmROYW1lWzBdOwogICAg IGlmIChkZXNjcmlwdGlvbkFuZE5hbWUuc2l6ZSgpID4gMSkKLSAgICAgICAgcGx1Z2luSW5mby5u YW1lID0gZGVzY3JpcHRpb25BbmROYW1lWzFdOworICAgICAgICBwbHVnaW4uaW5mby5uYW1lID0g ZGVzY3JpcHRpb25BbmROYW1lWzFdOwogCiAgICAgcmV0dXJuIHRydWU7CiB9CkBAIC0zMzksMjAg KzMzOSwxOCBAQCBib29sIE5ldHNjYXBlUGx1Z2luTW9kdWxlOjpnZXRQbHVnaW5JbmZvCiAgICAg ICAgIHJldHVybiBmYWxzZTsKICAgICAKICAgICAvLyBDaGVjayB0aGF0IHRoZSBhcmNoaXRlY3R1 cmUgaXMgdmFsaWQuCi0gICAgY3B1X3R5cGVfdCBwbHVnaW5BcmNoaXRlY3R1cmUgPSAwOwotICAg IGlmICghZ2V0UGx1Z2luQXJjaGl0ZWN0dXJlKGJ1bmRsZS5nZXQoKSwgcGx1Z2luQXJjaGl0ZWN0 dXJlKSkKKyAgICBpZiAoIWdldFBsdWdpbkFyY2hpdGVjdHVyZShidW5kbGUuZ2V0KCksIHBsdWdp bikpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAKLSAgICAvLyBDaGVjayB0aGF0IHRoZXJl J3MgdmFsaWQgaW5mbyBmb3IgdGhpcyBwbHVnLWluLgotICAgIGlmICghZ2V0UGx1Z2luSW5mb0Zy b21Qcm9wZXJ0eUxpc3RzKGJ1bmRsZS5nZXQoKSwgcGx1Z2luLmluZm8pICYmCi0gICAgICAgICFn ZXRQbHVnaW5JbmZvRnJvbUNhcmJvblJlc291cmNlcyhidW5kbGUuZ2V0KCksIHBsdWdpbi5pbmZv KSkKLSAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIAorCiAgICAgcGx1Z2luLnBhdGggPSBwbHVn aW5QYXRoOwotICAgIHBsdWdpbi5wbHVnaW5BcmNoaXRlY3R1cmUgPSBwbHVnaW5BcmNoaXRlY3R1 cmU7CiAgICAgcGx1Z2luLmJ1bmRsZUlkZW50aWZpZXIgPSBDRkJ1bmRsZUdldElkZW50aWZpZXIo YnVuZGxlLmdldCgpKTsKICAgICBwbHVnaW4udmVyc2lvbk51bWJlciA9IENGQnVuZGxlR2V0VmVy c2lvbk51bWJlcihidW5kbGUuZ2V0KCkpOwogICAgIAorICAgIC8vIENoZWNrIHRoYXQgdGhlcmUn cyB2YWxpZCBpbmZvIGZvciB0aGlzIHBsdWctaW4uCisgICAgaWYgKCFnZXRQbHVnaW5JbmZvRnJv bVByb3BlcnR5TGlzdHMoYnVuZGxlLmdldCgpLCBwbHVnaW4pICYmCisgICAgICAgICFnZXRQbHVn aW5JbmZvRnJvbUNhcmJvblJlc291cmNlcyhidW5kbGUuZ2V0KCksIHBsdWdpbikpCisgICAgICAg IHJldHVybiBmYWxzZTsKKyAgICAKICAgICBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IGZpbGVuYW1l KEFkb3B0Q0YsIENGVVJMQ29weUxhc3RQYXRoQ29tcG9uZW50KGJ1bmRsZVVSTC5nZXQoKSkpOwog ICAgIHBsdWdpbi5pbmZvLmZpbGUgPSBmaWxlbmFtZS5nZXQoKTsKICAgICAK