60406 2011-05-06 14:47:40 -0700 Simplify the PluginInfoStore interface 2011-05-06 15:50:49 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 399830 0 andersca 2011-05-06 14:47:40 -0700 Simplify the PluginInfoStore interface 399832 1 92645 andersca 2011-05-06 14:49:49 -0700 Created attachment 92645 Patch 399874 2 andersca 2011-05-06 15:50:49 -0700 Committed r85983: <http://trac.webkit.org/changeset/85983> 92645 2011-05-06 14:49:49 -0700 2011-05-06 15:48:00 -0700 Patch bug-60406-20110506144948.patch text/plain 11147 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1OTc4KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzQgQEAKKzIwMTEtMDUtMDYgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBTaW1wbGlmeSB0aGUgUGx1Z2luSW5mb1N0b3JlIGludGVy ZmFjZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjA0 MDYKKworICAgICAgICBKdXN0IGV4cG9zZSBhIHNpbmdsZSBBUEkgZm9yIGdldHRpbmcgYSBsaXN0 IG9mIHBsdWctaW5zIGZyb20gdGhlIGluZm8gc3RvcmUsCisgICAgICAgIFBsdWdpbkluZm9TdG9y ZTo6cGx1Z2lucyBhbmQgcmVtb3ZlIFBsdWdpbkluZm9TdG9yZTo6Z2V0UGx1Z2lucyBhbmQgUGx1 Z2luSW5mb1N0b3JlOjpnZXRQbHVnaW5QYXRocy4KKworICAgICAgICBBbHNvLCBjaGFuZ2UgdGhl IFdlYkNvbnRleHQ6OnBsdWdpbkluZm9TdG9yZSgpIGdldHRlciB0byByZXR1cm4gYSByZWZlcmVu Y2UuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5JbmZvU3RvcmUuY3BwOgor ICAgICAgICAoV2ViS2l0OjpQbHVnaW5JbmZvU3RvcmU6OnBsdWdpbnMpOgorICAgICAgICAqIFVJ UHJvY2Vzcy9QbHVnaW5zL1BsdWdpbkluZm9TdG9yZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9Q bHVnaW5zL1BsdWdpblByb2Nlc3NNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGx1Z2lu UHJvY2Vzc01hbmFnZXI6OmdldFBsdWdpblByb2Nlc3NDb25uZWN0aW9uKToKKyAgICAgICAgKiBV SVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm9jZXNzTWFuYWdlci5oOgorICAgICAgICAqIFVJUHJv Y2Vzcy9QbHVnaW5zL1dlYlBsdWdpblNpdGVEYXRhTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYlBsdWdpblNpdGVEYXRhTWFuYWdlcjo6R2V0U2l0ZXNXaXRoRGF0YVN0YXRlOjpHZXRT aXRlc1dpdGhEYXRhU3RhdGUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQbHVnaW5TaXRlRGF0YU1h bmFnZXI6OkNsZWFyU2l0ZURhdGFTdGF0ZTo6Q2xlYXJTaXRlRGF0YVN0YXRlKToKKyAgICAgICAg KFdlYktpdDo6V2ViUGx1Z2luU2l0ZURhdGFNYW5hZ2VyOjpnZXRTaXRlc1dpdGhEYXRhKToKKyAg ICAgICAgKFdlYktpdDo6V2ViUGx1Z2luU2l0ZURhdGFNYW5hZ2VyOjpjbGVhclNpdGVEYXRhKToK KyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YkNvbnRleHQ6OmdldFBsdWdpbnMpOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0OjpnZXRQ bHVnaW5QYXRoKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQ29udGV4dC5oOgorICAgICAgICAo V2ViS2l0OjpXZWJDb250ZXh0OjpwbHVnaW5JbmZvU3RvcmUpOgorICAgICAgICAqIFVJUHJvY2Vz cy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmNhblNo b3dNSU1FVHlwZSk6CisKIDIwMTEtMDUtMDYgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYW4gQmVybnN0ZWluLgpJbmRleDogU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmNwcAkocmV2aXNpb24gODU5NTkpCisrKyBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTUxNSwxOCArNTE1LDIxIEBAIHZvaWQgV2ViQ29udGV4dDo6YWRkVmlzaXRlZExpbmtIYXNoKExp bmsKICAgICBtX3Zpc2l0ZWRMaW5rUHJvdmlkZXIuYWRkVmlzaXRlZExpbmsobGlua0hhc2gpOwog fQogCi12b2lkIFdlYkNvbnRleHQ6OmdldFBsdWdpbnMoYm9vbCByZWZyZXNoLCBWZWN0b3I8UGx1 Z2luSW5mbz4mIHBsdWdpbnMpCit2b2lkIFdlYkNvbnRleHQ6OmdldFBsdWdpbnMoYm9vbCByZWZy ZXNoLCBWZWN0b3I8UGx1Z2luSW5mbz4mIHBsdWdpbkluZm9zKQogewogICAgIGlmIChyZWZyZXNo KQotICAgICAgICBwbHVnaW5JbmZvU3RvcmUoKS0+cmVmcmVzaCgpOwotICAgIHBsdWdpbkluZm9T dG9yZSgpLT5nZXRQbHVnaW5zKHBsdWdpbnMpOworICAgICAgICBtX3BsdWdpbkluZm9TdG9yZS5y ZWZyZXNoKCk7CisKKyAgICBWZWN0b3I8UGx1Z2luSW5mb1N0b3JlOjpQbHVnaW4+IHBsdWdpbnMg PSBtX3BsdWdpbkluZm9TdG9yZS5wbHVnaW5zKCk7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkg PCBwbHVnaW5zLnNpemUoKTsgKytpKQorICAgICAgICBwbHVnaW5JbmZvcy5hcHBlbmQocGx1Z2lu c1tpXS5pbmZvKTsKIH0KIAogdm9pZCBXZWJDb250ZXh0OjpnZXRQbHVnaW5QYXRoKGNvbnN0IFN0 cmluZyYgbWltZVR5cGUsIGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nLCBTdHJpbmcmIHBsdWdpblBh dGgpCiB7CiAgICAgU3RyaW5nIG5ld01pbWVUeXBlID0gbWltZVR5cGUubG93ZXIoKTsKIAotICAg IFBsdWdpbkluZm9TdG9yZTo6UGx1Z2luIHBsdWdpbiA9IHBsdWdpbkluZm9TdG9yZSgpLT5maW5k UGx1Z2luKG5ld01pbWVUeXBlLCBLVVJMKFBhcnNlZFVSTFN0cmluZywgdXJsU3RyaW5nKSk7Cisg ICAgUGx1Z2luSW5mb1N0b3JlOjpQbHVnaW4gcGx1Z2luID0gcGx1Z2luSW5mb1N0b3JlKCkuZmlu ZFBsdWdpbihuZXdNaW1lVHlwZSwgS1VSTChQYXJzZWRVUkxTdHJpbmcsIHVybFN0cmluZykpOwog ICAgIGlmICghcGx1Z2luLnBhdGgpCiAgICAgICAgIHJldHVybjsKIApJbmRleDogU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5oCShyZXZpc2lvbiA4NTk1OSkKKysrIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmgJKHdvcmtpbmcgY29weSkKQEAgLTEwNSw3ICsxMDUs NyBAQCBwdWJsaWM6CiAgICAgCiAgICAgdm9pZCBzZXRBZGRpdGlvbmFsUGx1Z2luc0RpcmVjdG9y eShjb25zdCBTdHJpbmcmKTsKIAotICAgIFBsdWdpbkluZm9TdG9yZSogcGx1Z2luSW5mb1N0b3Jl KCkgeyByZXR1cm4gJm1fcGx1Z2luSW5mb1N0b3JlOyB9CisgICAgUGx1Z2luSW5mb1N0b3JlJiBw bHVnaW5JbmZvU3RvcmUoKSB7IHJldHVybiBtX3BsdWdpbkluZm9TdG9yZTsgfQogICAgIFN0cmlu ZyBhcHBsaWNhdGlvbkNhY2hlRGlyZWN0b3J5KCk7CiAKICAgICB2b2lkIHNldEFsd2F5c1VzZXND b21wbGV4VGV4dENvZGVQYXRoKGJvb2wpOwpAQCAtMTkwLDcgKzE5MCw3IEBAIHByaXZhdGU6CiAg ICAgdm9pZCBkaWRVcGRhdGVIaXN0b3J5VGl0bGUodWludDY0X3QgcGFnZUlELCBjb25zdCBTdHJp bmcmIHRpdGxlLCBjb25zdCBTdHJpbmcmIHVybCwgdWludDY0X3QgZnJhbWVJRCk7CiAKICAgICAv LyBQbHVnaW5zCi0gICAgdm9pZCBnZXRQbHVnaW5zKGJvb2wgcmVmcmVzaCwgVmVjdG9yPFdlYkNv cmU6OlBsdWdpbkluZm8+JiBwbHVnaW5zKTsKKyAgICB2b2lkIGdldFBsdWdpbnMoYm9vbCByZWZy ZXNoLCBWZWN0b3I8V2ViQ29yZTo6UGx1Z2luSW5mbz4mKTsKICAgICB2b2lkIGdldFBsdWdpblBh dGgoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcsIFN0cmlu ZyYgcGx1Z2luUGF0aCk7CiAjaWYgIUVOQUJMRShQTFVHSU5fUFJPQ0VTUykKICAgICB2b2lkIGRp ZEdldFNpdGVzV2l0aFBsdWdpbkRhdGEoY29uc3QgVmVjdG9yPFN0cmluZz4mIHNpdGVzLCB1aW50 NjRfdCBjYWxsYmFja0lEKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCShyZXZpc2lvbiA4NTk1OSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MzksNyArNTM5LDcgQEAgYm9vbCBX ZWJQYWdlUHJveHk6OmNhblNob3dNSU1FVHlwZShjb25zdAogICAgICAgICByZXR1cm4gIU1JTUVU eXBlUmVnaXN0cnk6OmlzVW5zdXBwb3J0ZWRUZXh0TUlNRVR5cGUobWltZVR5cGUpOwogCiAgICAg U3RyaW5nIG5ld01pbWVUeXBlID0gbWltZVR5cGU7Ci0gICAgUGx1Z2luSW5mb1N0b3JlOjpQbHVn aW4gcGx1Z2luID0gbV9wcm9jZXNzLT5jb250ZXh0KCktPnBsdWdpbkluZm9TdG9yZSgpLT5maW5k UGx1Z2luKG5ld01pbWVUeXBlLCBLVVJMKCkpOworICAgIFBsdWdpbkluZm9TdG9yZTo6UGx1Z2lu IHBsdWdpbiA9IG1fcHJvY2Vzcy0+Y29udGV4dCgpLT5wbHVnaW5JbmZvU3RvcmUoKS5maW5kUGx1 Z2luKG5ld01pbWVUeXBlLCBLVVJMKCkpOwogICAgIGlmICghcGx1Z2luLnBhdGguaXNOdWxsKCkp CiAgICAgICAgIHJldHVybiB0cnVlOwogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv UGx1Z2lucy9QbHVnaW5JbmZvU3RvcmUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbkluZm9TdG9yZS5jcHAJKHJldmlzaW9uIDg1OTc4KQor KysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luSW5mb1N0b3JlLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMTA3LDI3ICsxMDcsMTMgQEAgdm9pZCBQbHVnaW5JbmZvU3RvcmU6 OmxvYWRQbHVnaW4oVmVjdG9yPAogICAgIHBsdWdpbnMuYXBwZW5kKHBsdWdpbik7CiB9CiAKLXZv aWQgUGx1Z2luSW5mb1N0b3JlOjpnZXRQbHVnaW5zKFZlY3RvcjxQbHVnaW5JbmZvPiYgcGx1Z2lu cykKK1ZlY3RvcjxQbHVnaW5JbmZvU3RvcmU6OlBsdWdpbj4gUGx1Z2luSW5mb1N0b3JlOjpwbHVn aW5zKCkKIHsKICAgICBsb2FkUGx1Z2luc0lmTmVjZXNzYXJ5KCk7CiAKLSAgICBmb3IgKHNpemVf dCBpID0gMDsgaSA8IG1fcGx1Z2lucy5zaXplKCk7ICsraSkKLSAgICAgICAgcGx1Z2lucy5hcHBl bmQobV9wbHVnaW5zW2ldLmluZm8pOwotfQotCi12b2lkIFBsdWdpbkluZm9TdG9yZTo6Z2V0UGx1 Z2luUGF0aHMoVmVjdG9yPFN0cmluZz4mIHBsdWdpblBhdGhzKQotewotICAgIGxvYWRQbHVnaW5z SWZOZWNlc3NhcnkoKTsKLSAgICAKLSAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1fcGx1Z2lu cy5zaXplKCk7ICsraSkKLSAgICAgICAgcGx1Z2luUGF0aHMuYXBwZW5kKG1fcGx1Z2luc1tpXS5w YXRoKTsKLX0KLQotY29uc3QgVmVjdG9yPFBsdWdpbkluZm9TdG9yZTo6UGx1Z2luPiYgUGx1Z2lu SW5mb1N0b3JlOjpwbHVnaW5zKCkKLXsKLSAgICBsb2FkUGx1Z2luc0lmTmVjZXNzYXJ5KCk7Cisg ICAgVmVjdG9yPFBsdWdpbj4gcGx1Z2lucyhtX3BsdWdpbnMpOwogCi0gICAgcmV0dXJuIG1fcGx1 Z2luczsKKyAgICByZXR1cm4gcGx1Z2luczsKIH0KIAogUGx1Z2luSW5mb1N0b3JlOjpQbHVnaW4g UGx1Z2luSW5mb1N0b3JlOjpmaW5kUGx1Z2luRm9yTUlNRVR5cGUoY29uc3QgU3RyaW5nJiBtaW1l VHlwZSkKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbkluZm9T dG9yZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1Bs dWdpbkluZm9TdG9yZS5oCShyZXZpc2lvbiA4NTk3OCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9QbHVnaW5zL1BsdWdpbkluZm9TdG9yZS5oCSh3b3JraW5nIGNvcHkpCkBAIC00MCwxMiAr NDAsNiBAQCBjbGFzcyBQbHVnaW5JbmZvU3RvcmUgewogcHVibGljOgogICAgIFBsdWdpbkluZm9T dG9yZSgpOwogCi0gICAgdm9pZCBzZXRBZGRpdGlvbmFsUGx1Z2luc0RpcmVjdG9yaWVzKGNvbnN0 IFZlY3RvcjxTdHJpbmc+Jik7Ci0KLSAgICB2b2lkIHJlZnJlc2goKTsKLSAgICB2b2lkIGdldFBs dWdpbnMoVmVjdG9yPFdlYkNvcmU6OlBsdWdpbkluZm8+Jik7Ci0gICAgdm9pZCBnZXRQbHVnaW5Q YXRocyhWZWN0b3I8U3RyaW5nPiYpOwotCiAgICAgLy8gUmVwcmVzZW50cyBhIHNpbmdsZSBwbHVn LWluLgogICAgIHN0cnVjdCBQbHVnaW4gewogICAgICAgICBTdHJpbmcgcGF0aDsKQEAgLTU5LDcg KzUzLDEwIEBAIHB1YmxpYzoKICNlbmRpZgogICAgIH07CiAKLSAgICBjb25zdCBWZWN0b3I8UGx1 Z2luPiYgcGx1Z2lucygpOworICAgIHZvaWQgc2V0QWRkaXRpb25hbFBsdWdpbnNEaXJlY3Rvcmll cyhjb25zdCBWZWN0b3I8U3RyaW5nPiYpOworCisgICAgdm9pZCByZWZyZXNoKCk7CisgICAgVmVj dG9yPFBsdWdpbj4gcGx1Z2lucygpOwogCiAgICAgLy8gUmV0dXJucyB0aGUgaW5mbyBmb3IgYSBw bHVnLWluIHRoYXQgY2FuIGhhbmRsZSB0aGUgZ2l2ZW4gTUlNRSB0eXBlLgogICAgIC8vIElmIHRo ZSBNSU1FIHR5cGUgaXMgbnVsbCwgdGhlIGZpbGUgZXh0ZW5zaW9uIG9mIHRoZSBnaXZlbiB1cmwg d2lsbCBiZSB1c2VkIHRvIGluZmVyIHRoZQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1BsdWdpbnMvUGx1Z2luUHJvY2Vzc01hbmFnZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb2Nlc3NNYW5hZ2VyLmNwcAkocmV2aXNp b24gODU5NTkpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm9j ZXNzTWFuYWdlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ1LDExICs0NSwxMSBAQCBQbHVnaW5Q cm9jZXNzTWFuYWdlcjo6UGx1Z2luUHJvY2Vzc01hbmFnCiB7CiB9CiAKLXZvaWQgUGx1Z2luUHJv Y2Vzc01hbmFnZXI6OmdldFBsdWdpblByb2Nlc3NDb25uZWN0aW9uKFBsdWdpbkluZm9TdG9yZSog cGx1Z2luSW5mb1N0b3JlLCBjb25zdCBTdHJpbmcmIHBsdWdpblBhdGgsIFBhc3NSZWZQdHI8TWVz c2FnZXM6OldlYlByb2Nlc3NQcm94eTo6R2V0UGx1Z2luUHJvY2Vzc0Nvbm5lY3Rpb246OkRlbGF5 ZWRSZXBseT4gcmVwbHkpCit2b2lkIFBsdWdpblByb2Nlc3NNYW5hZ2VyOjpnZXRQbHVnaW5Qcm9j ZXNzQ29ubmVjdGlvbihQbHVnaW5JbmZvU3RvcmUmIHBsdWdpbkluZm9TdG9yZSwgY29uc3QgU3Ry aW5nJiBwbHVnaW5QYXRoLCBQYXNzUmVmUHRyPE1lc3NhZ2VzOjpXZWJQcm9jZXNzUHJveHk6Okdl dFBsdWdpblByb2Nlc3NDb25uZWN0aW9uOjpEZWxheWVkUmVwbHk+IHJlcGx5KQogewogICAgIEFT U0VSVCghcGx1Z2luUGF0aC5pc051bGwoKSk7CiAKLSAgICBQbHVnaW5JbmZvU3RvcmU6OlBsdWdp biBwbHVnaW4gPSBwbHVnaW5JbmZvU3RvcmUtPmluZm9Gb3JQbHVnaW5XaXRoUGF0aChwbHVnaW5Q YXRoKTsKKyAgICBQbHVnaW5JbmZvU3RvcmU6OlBsdWdpbiBwbHVnaW4gPSBwbHVnaW5JbmZvU3Rv cmUuaW5mb0ZvclBsdWdpbldpdGhQYXRoKHBsdWdpblBhdGgpOwogICAgIFBsdWdpblByb2Nlc3NQ cm94eSogcGx1Z2luUHJvY2VzcyA9IGdldE9yQ3JlYXRlUGx1Z2luUHJvY2VzcyhwbHVnaW4pOwog ICAgIHBsdWdpblByb2Nlc3MtPmdldFBsdWdpblByb2Nlc3NDb25uZWN0aW9uKHJlcGx5KTsKIH0K SW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb2Nlc3NNYW5h Z2VyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1 Z2luUHJvY2Vzc01hbmFnZXIuaAkocmV2aXNpb24gODU5NTkpCisrKyBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm9jZXNzTWFuYWdlci5oCSh3b3JraW5nIGNvcHkpCkBA IC01MCw3ICs1MCw3IEBAIGNsYXNzIFBsdWdpblByb2Nlc3NNYW5hZ2VyIHsKIHB1YmxpYzoKICAg ICBzdGF0aWMgUGx1Z2luUHJvY2Vzc01hbmFnZXImIHNoYXJlZCgpOwogCi0gICAgdm9pZCBnZXRQ bHVnaW5Qcm9jZXNzQ29ubmVjdGlvbihQbHVnaW5JbmZvU3RvcmUqLCBjb25zdCBTdHJpbmcmIHBs dWdpblBhdGgsIFBhc3NSZWZQdHI8TWVzc2FnZXM6OldlYlByb2Nlc3NQcm94eTo6R2V0UGx1Z2lu UHJvY2Vzc0Nvbm5lY3Rpb246OkRlbGF5ZWRSZXBseT4pOworICAgIHZvaWQgZ2V0UGx1Z2luUHJv Y2Vzc0Nvbm5lY3Rpb24oUGx1Z2luSW5mb1N0b3JlJiwgY29uc3QgU3RyaW5nJiBwbHVnaW5QYXRo LCBQYXNzUmVmUHRyPE1lc3NhZ2VzOjpXZWJQcm9jZXNzUHJveHk6OkdldFBsdWdpblByb2Nlc3ND b25uZWN0aW9uOjpEZWxheWVkUmVwbHk+KTsKICAgICB2b2lkIHJlbW92ZVBsdWdpblByb2Nlc3NQ cm94eShQbHVnaW5Qcm9jZXNzUHJveHkqKTsKIAogICAgIHZvaWQgZ2V0U2l0ZXNXaXRoRGF0YShj b25zdCBQbHVnaW5JbmZvU3RvcmU6OlBsdWdpbiYsIFdlYlBsdWdpblNpdGVEYXRhTWFuYWdlcios IHVpbnQ2NF90IGNhbGxiYWNrSUQpOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Bs dWdpbnMvV2ViUGx1Z2luU2l0ZURhdGFNYW5hZ2VyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9XZWJQbHVnaW5TaXRlRGF0YU1hbmFnZXIuY3BwCShy ZXZpc2lvbiA4NTk1OSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1dlYlBs dWdpblNpdGVEYXRhTWFuYWdlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQxLDcgKzQxLDcgQEAg cHVibGljOgogICAgIGV4cGxpY2l0IEdldFNpdGVzV2l0aERhdGFTdGF0ZShXZWJQbHVnaW5TaXRl RGF0YU1hbmFnZXIqIHdlYlBsdWdpblNpdGVEYXRhTWFuYWdlciwgdWludDY0X3QgY2FsbGJhY2tJ RCkKICAgICAgICAgOiBtX3dlYlBsdWdpblNpdGVEYXRhTWFuYWdlcih3ZWJQbHVnaW5TaXRlRGF0 YU1hbmFnZXIpCiAgICAgICAgICwgbV9jYWxsYmFja0lEKGNhbGxiYWNrSUQpCi0gICAgICAgICwg bV9wbHVnaW5zKHdlYlBsdWdpblNpdGVEYXRhTWFuYWdlci0+bV93ZWJDb250ZXh0LT5wbHVnaW5J bmZvU3RvcmUoKS0+cGx1Z2lucygpKQorICAgICAgICAsIG1fcGx1Z2lucyh3ZWJQbHVnaW5TaXRl RGF0YU1hbmFnZXItPm1fd2ViQ29udGV4dC0+cGx1Z2luSW5mb1N0b3JlKCkucGx1Z2lucygpKQog ICAgIHsKICAgICB9CiAKQEAgLTgyLDcgKzgyLDcgQEAgcHVibGljOgogICAgICAgICAsIG1fZmxh Z3MoZmxhZ3MpCiAgICAgICAgICwgbV9tYXhBZ2VJblNlY29uZHMobWF4QWdlSW5TZWNvbmRzKQog ICAgICAgICAsIG1fY2FsbGJhY2tJRChjYWxsYmFja0lEKQotICAgICAgICAsIG1fcGx1Z2lucyh3 ZWJQbHVnaW5TaXRlRGF0YU1hbmFnZXItPm1fd2ViQ29udGV4dC0+cGx1Z2luSW5mb1N0b3JlKCkt PnBsdWdpbnMoKSkKKyAgICAgICAgLCBtX3BsdWdpbnMod2ViUGx1Z2luU2l0ZURhdGFNYW5hZ2Vy LT5tX3dlYkNvbnRleHQtPnBsdWdpbkluZm9TdG9yZSgpLnBsdWdpbnMoKSkKICAgICB7CiAgICAg fQogCkBAIC0xNjUsOCArMTY1LDEwIEBAIHZvaWQgV2ViUGx1Z2luU2l0ZURhdGFNYW5hZ2VyOjpn ZXRTaXRlc1cKICNlbHNlCiAgICAgbV93ZWJDb250ZXh0LT5yZWxhdW5jaFByb2Nlc3NJZk5lY2Vz c2FyeSgpOwogCisgICAgVmVjdG9yPFBsdWdpbkluZm9TdG9yZTo6UGx1Z2luPiBwbHVnaW5zID0g bV93ZWJDb250ZXh0LT5wbHVnaW5JbmZvU3RvcmUoKS5wbHVnaW5zKCk7CiAgICAgVmVjdG9yPFN0 cmluZz4gcGx1Z2luUGF0aHM7Ci0gICAgbV93ZWJDb250ZXh0LT5wbHVnaW5JbmZvU3RvcmUoKS0+ Z2V0UGx1Z2luUGF0aHMocGx1Z2luUGF0aHMpOworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwg cGx1Z2lucy5zaXplKCk7ICsraSkKKyAgICAgICAgcGx1Z2luUGF0aHMuYXBwZW5kKHBsdWdpbnNb aV0ucGF0aCk7CiAKICAgICAvLyBGSVhNRSAoTXVsdGktV2ViUHJvY2Vzcyk6IFdoZW4gbXVsdGkt cHJvY2VzcyBpcyBlbmFibGVkLCB3ZSBtdXN0IGFsd2F5cyB1c2UgYSBwbHVnLWluIHByb2Nlc3Mg Zm9yIHRoaXMsCiAgICAgLy8gc28gdGhpcyBjb2RlIHNob3VsZCBqdXN0IGJlIHJlbW92ZWQuCkBA IC0yMjQsMTAgKzIyNiwxMiBAQCB2b2lkIFdlYlBsdWdpblNpdGVEYXRhTWFuYWdlcjo6Y2xlYXJT aXRlCiAgICAgbV9wZW5kaW5nQ2xlYXJTaXRlRGF0YS5zZXQoY2FsbGJhY2tJRCwgc3RhdGUpOwog ICAgIHN0YXRlLT5jbGVhclNpdGVEYXRhRm9yTmV4dFBsdWdpbigpOwogI2Vsc2UKLQogICAgIG1f d2ViQ29udGV4dC0+cmVsYXVuY2hQcm9jZXNzSWZOZWNlc3NhcnkoKTsKKworICAgIFZlY3RvcjxQ bHVnaW5JbmZvU3RvcmU6OlBsdWdpbj4gcGx1Z2lucyA9IG1fd2ViQ29udGV4dC0+cGx1Z2luSW5m b1N0b3JlKCkucGx1Z2lucygpOwogICAgIFZlY3RvcjxTdHJpbmc+IHBsdWdpblBhdGhzOwotICAg IG1fd2ViQ29udGV4dC0+cGx1Z2luSW5mb1N0b3JlKCktPmdldFBsdWdpblBhdGhzKHBsdWdpblBh dGhzKTsKKyAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHBsdWdpbnMuc2l6ZSgpOyArK2kpCisg ICAgICAgIHBsdWdpblBhdGhzLmFwcGVuZChwbHVnaW5zW2ldLnBhdGgpOwogCiAgICAgLy8gRklY TUUgKE11bHRpLVdlYlByb2Nlc3MpOiBXaGVuIG11bHRpLXByb2Nlc3MgaXMgZW5hYmxlZCwgd2Ug bXVzdCBhbHdheXMgdXNlIGEgcGx1Zy1pbiBwcm9jZXNzIGZvciB0aGlzLAogICAgIC8vIHNvIHRo aXMgY29kZSBzaG91bGQganVzdCBiZSByZW1vdmVkLgo=