62651 2011-06-14 10:46:47 -0700 Start replacing PluginInfoStore::Plugin with PluginModuleInfo 2011-06-14 11:03:13 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 420561 0 andersca 2011-06-14 10:46:47 -0700 Start replacing PluginInfoStore::Plugin with PluginModuleInfo 420562 1 97139 andersca 2011-06-14 10:48:07 -0700 Created attachment 97139 Patch 420579 2 andersca 2011-06-14 11:03:13 -0700 Committed r88825: <http://trac.webkit.org/changeset/88825> 97139 2011-06-14 10:48:07 -0700 2011-06-14 10:49:59 -0700 Patch bug-62651-20110614104811.patch text/plain 12906 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg4ODIyKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTEtMDYtMTQgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBTdGFydCByZXBsYWNpbmcgUGx1Z2luSW5mb1N0b3JlOjpQ bHVnaW4gd2l0aCBQbHVnaW5Nb2R1bGVJbmZvCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD02MjY1MQorCisgICAgICAgICogVUlQcm9jZXNzL1BsdWdpbnMv UGx1Z2luSW5mb1N0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luSW5mb1N0b3JlOjpw bHVnaW5zKToKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luSW5mb1N0b3JlOjpmaW5kUGx1Z2luRm9y TUlNRVR5cGUpOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5JbmZvU3RvcmU6OmZpbmRQbHVnaW5G b3JFeHRlbnNpb24pOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5JbmZvU3RvcmU6OmluZm9Gb3JQ bHVnaW5XaXRoUGF0aCk6CisgICAgICAgICogVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luSW5mb1N0 b3JlLmg6CisgICAgICAgICogVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vzc01hbmFnZXIu Y3BwOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5Qcm9jZXNzTWFuYWdlcjo6Z2V0UGx1Z2luUHJv Y2Vzc0Nvbm5lY3Rpb24pOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5Qcm9jZXNzTWFuYWdlcjo6 Z2V0U2l0ZXNXaXRoRGF0YSk6CisgICAgICAgIChXZWJLaXQ6OlBsdWdpblByb2Nlc3NNYW5hZ2Vy OjpjbGVhclNpdGVEYXRhKToKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luUHJvY2Vzc01hbmFnZXI6 OmdldE9yQ3JlYXRlUGx1Z2luUHJvY2Vzcyk6CisgICAgICAgICogVUlQcm9jZXNzL1BsdWdpbnMv UGx1Z2luUHJvY2Vzc01hbmFnZXIuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvUGx1Z2lucy9QbHVn aW5Qcm9jZXNzUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5Qcm9jZXNzUHJveHk6 OmNyZWF0ZSk6CisgICAgICAgICogVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vzc1Byb3h5 Lmg6CisgICAgICAgIChXZWJLaXQ6OlBsdWdpblByb2Nlc3NQcm94eTo6cGx1Z2luSW5mbyk6Cisg ICAgICAgICogVUlQcm9jZXNzL1BsdWdpbnMvbWFjL1BsdWdpblByb2Nlc3NQcm94eU1hYy5tbToK KyAgICAgICAgKFdlYktpdDo6UGx1Z2luUHJvY2Vzc1Byb3h5OjpwbHVnaW5OZWVkc0V4ZWN1dGFi bGVIZWFwKToKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luUHJvY2Vzc1Byb3h5OjpjcmVhdGVQcm9w ZXJ0eUxpc3RGaWxlKToKKwogMjAxMS0wNi0xNCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FA YXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpJbmRleDogU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luSW5mb1N0b3JlLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5JbmZvU3RvcmUu Y3BwCShyZXZpc2lvbiA4ODgxMSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5z L1BsdWdpbkluZm9TdG9yZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI2LDYgKzI2LDcgQEAKICNp bmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJQbHVnaW5JbmZvU3RvcmUuaCIKIAorI2luY2x1 ZGUgIlBsdWdpbk1vZHVsZUluZm8uaCIKICNpbmNsdWRlIDxXZWJDb3JlL0tVUkwuaD4KICNpbmNs dWRlIDxXZWJDb3JlL01JTUVUeXBlUmVnaXN0cnkuaD4KICNpbmNsdWRlIDxhbGdvcml0aG0+CkBA IC0xMTAsMTYgKzExMSwxNiBAQCB2b2lkIFBsdWdpbkluZm9TdG9yZTo6bG9hZFBsdWdpbihWZWN0 b3I8CiAgICAgcGx1Z2lucy5hcHBlbmQocGx1Z2luKTsKIH0KIAotVmVjdG9yPFBsdWdpbkluZm9T dG9yZTo6UGx1Z2luPiBQbHVnaW5JbmZvU3RvcmU6OnBsdWdpbnMoKQorVmVjdG9yPFBsdWdpbk1v ZHVsZUluZm8+IFBsdWdpbkluZm9TdG9yZTo6cGx1Z2lucygpCiB7CiAgICAgbG9hZFBsdWdpbnNJ Zk5lY2Vzc2FyeSgpOwogCi0gICAgVmVjdG9yPFBsdWdpbj4gcGx1Z2lucyhtX3BsdWdpbnMpOwor ICAgIFZlY3RvcjxQbHVnaW5Nb2R1bGVJbmZvPiBwbHVnaW5zKG1fcGx1Z2lucyk7CiAKICAgICBy ZXR1cm4gcGx1Z2luczsKIH0KIAotUGx1Z2luSW5mb1N0b3JlOjpQbHVnaW4gUGx1Z2luSW5mb1N0 b3JlOjpmaW5kUGx1Z2luRm9yTUlNRVR5cGUoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSkKK1BsdWdp bk1vZHVsZUluZm8gUGx1Z2luSW5mb1N0b3JlOjpmaW5kUGx1Z2luRm9yTUlNRVR5cGUoY29uc3Qg U3RyaW5nJiBtaW1lVHlwZSkgY29uc3QKIHsKICAgICBBU1NFUlQoIW1pbWVUeXBlLmlzTnVsbCgp KTsKICAgICAKQEAgLTEzNiw3ICsxMzcsNyBAQCBQbHVnaW5JbmZvU3RvcmU6OlBsdWdpbiBQbHVn aW5JbmZvU3RvcmU6CiAgICAgcmV0dXJuIFBsdWdpbigpOwogfQogCi1QbHVnaW5JbmZvU3RvcmU6 OlBsdWdpbiBQbHVnaW5JbmZvU3RvcmU6OmZpbmRQbHVnaW5Gb3JFeHRlbnNpb24oY29uc3QgU3Ry aW5nJiBleHRlbnNpb24sIFN0cmluZyYgbWltZVR5cGUpCitQbHVnaW5Nb2R1bGVJbmZvIFBsdWdp bkluZm9TdG9yZTo6ZmluZFBsdWdpbkZvckV4dGVuc2lvbihjb25zdCBTdHJpbmcmIGV4dGVuc2lv biwgU3RyaW5nJiBtaW1lVHlwZSkgY29uc3QKIHsKICAgICBBU1NFUlQoIWV4dGVuc2lvbi5pc051 bGwoKSk7CiAgICAgCkBAIC0yMTEsNyArMjEyLDcgQEAgUGx1Z2luSW5mb1N0b3JlOjpQbHVnaW4g UGx1Z2luSW5mb1N0b3JlOgogICAgIHJldHVybiBQbHVnaW4oKTsKIH0KIAotUGx1Z2luSW5mb1N0 b3JlOjpQbHVnaW4gUGx1Z2luSW5mb1N0b3JlOjppbmZvRm9yUGx1Z2luV2l0aFBhdGgoY29uc3Qg U3RyaW5nJiBwbHVnaW5QYXRoKQorUGx1Z2luSW5mb1N0b3JlOjpQbHVnaW4gUGx1Z2luSW5mb1N0 b3JlOjppbmZvRm9yUGx1Z2luV2l0aFBhdGgoY29uc3QgU3RyaW5nJiBwbHVnaW5QYXRoKSBjb25z dAogewogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9wbHVnaW5zLnNpemUoKTsgKytpKSB7 CiAgICAgICAgIGlmIChtX3BsdWdpbnNbaV0ucGF0aCA9PSBwbHVnaW5QYXRoKQpJbmRleDogU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luSW5mb1N0b3JlLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luSW5mb1N0b3JlLmgJ KHJldmlzaW9uIDg4ODExKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1 Z2luSW5mb1N0b3JlLmgJKHdvcmtpbmcgY29weSkKQEAgLTY0LDEyICs2NCwxMiBAQCBwdWJsaWM6 CiAgICAgUGx1Z2luIGZpbmRQbHVnaW4oU3RyaW5nJiBtaW1lVHlwZSwgY29uc3QgV2ViQ29yZTo6 S1VSTCYgdXJsKTsKICAgICAKICAgICAvLyBSZXR1cm5zIHRoZSBpbmZvIGZvciB0aGUgcGx1Zy1p biB3aXRoIHRoZSBnaXZlbiBwYXRoLgotICAgIFBsdWdpbiBpbmZvRm9yUGx1Z2luV2l0aFBhdGgo Y29uc3QgU3RyaW5nJiBwbHVnaW5QYXRoKTsKKyAgICBQbHVnaW4gaW5mb0ZvclBsdWdpbldpdGhQ YXRoKGNvbnN0IFN0cmluZyYgcGx1Z2luUGF0aCkgY29uc3Q7CiAKIHByaXZhdGU6CiAKLSAgICBQ bHVnaW4gZmluZFBsdWdpbkZvck1JTUVUeXBlKGNvbnN0IFN0cmluZyYgbWltZVR5cGUpOwotICAg IFBsdWdpbiBmaW5kUGx1Z2luRm9yRXh0ZW5zaW9uKGNvbnN0IFN0cmluZyYgZXh0ZW5zaW9uLCBT dHJpbmcmIG1pbWVUeXBlKTsKKyAgICBQbHVnaW5JbmZvU3RvcmU6OlBsdWdpbiBmaW5kUGx1Z2lu Rm9yTUlNRVR5cGUoY29uc3QgU3RyaW5nJiBtaW1lVHlwZSkgY29uc3Q7CisgICAgUGx1Z2luSW5m b1N0b3JlOjpQbHVnaW4gZmluZFBsdWdpbkZvckV4dGVuc2lvbihjb25zdCBTdHJpbmcmIGV4dGVu c2lvbiwgU3RyaW5nJiBtaW1lVHlwZSkgY29uc3Q7CiAKICAgICB2b2lkIGxvYWRQbHVnaW5zSWZO ZWNlc3NhcnkoKTsKICAgICBzdGF0aWMgdm9pZCBsb2FkUGx1Z2luKFZlY3RvcjxQbHVnaW4+JiBw bHVnaW5zLCBjb25zdCBTdHJpbmcmIHBsdWdpblBhdGgpOwpJbmRleDogU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vzc01hbmFnZXIuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb2Nlc3NNYW5hZ2VyLmNw cAkocmV2aXNpb24gODg4MTEpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9Q bHVnaW5Qcm9jZXNzTWFuYWdlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ1LDcgKzQ1LDcgQEAg UGx1Z2luUHJvY2Vzc01hbmFnZXI6OlBsdWdpblByb2Nlc3NNYW5hZwogewogfQogCi12b2lkIFBs dWdpblByb2Nlc3NNYW5hZ2VyOjpnZXRQbHVnaW5Qcm9jZXNzQ29ubmVjdGlvbihQbHVnaW5JbmZv U3RvcmUmIHBsdWdpbkluZm9TdG9yZSwgY29uc3QgU3RyaW5nJiBwbHVnaW5QYXRoLCBQYXNzUmVm UHRyPE1lc3NhZ2VzOjpXZWJQcm9jZXNzUHJveHk6OkdldFBsdWdpblByb2Nlc3NDb25uZWN0aW9u OjpEZWxheWVkUmVwbHk+IHJlcGx5KQordm9pZCBQbHVnaW5Qcm9jZXNzTWFuYWdlcjo6Z2V0UGx1 Z2luUHJvY2Vzc0Nvbm5lY3Rpb24oY29uc3QgUGx1Z2luSW5mb1N0b3JlJiBwbHVnaW5JbmZvU3Rv cmUsIGNvbnN0IFN0cmluZyYgcGx1Z2luUGF0aCwgUGFzc1JlZlB0cjxNZXNzYWdlczo6V2ViUHJv Y2Vzc1Byb3h5OjpHZXRQbHVnaW5Qcm9jZXNzQ29ubmVjdGlvbjo6RGVsYXllZFJlcGx5PiByZXBs eSkKIHsKICAgICBBU1NFUlQoIXBsdWdpblBhdGguaXNOdWxsKCkpOwogCkBAIC02MiwxMyArNjIs MTMgQEAgdm9pZCBQbHVnaW5Qcm9jZXNzTWFuYWdlcjo6cmVtb3ZlUGx1Z2luUAogICAgIG1fcGx1 Z2luUHJvY2Vzc2VzLnJlbW92ZSh2ZWN0b3JJbmRleCk7CiB9CiAKLXZvaWQgUGx1Z2luUHJvY2Vz c01hbmFnZXI6OmdldFNpdGVzV2l0aERhdGEoY29uc3QgUGx1Z2luSW5mb1N0b3JlOjpQbHVnaW4m IHBsdWdpbiwgV2ViUGx1Z2luU2l0ZURhdGFNYW5hZ2VyKiB3ZWJQbHVnaW5TaXRlRGF0YU1hbmFn ZXIsIHVpbnQ2NF90IGNhbGxiYWNrSUQpCit2b2lkIFBsdWdpblByb2Nlc3NNYW5hZ2VyOjpnZXRT aXRlc1dpdGhEYXRhKGNvbnN0IFBsdWdpbk1vZHVsZUluZm8mIHBsdWdpbiwgV2ViUGx1Z2luU2l0 ZURhdGFNYW5hZ2VyKiB3ZWJQbHVnaW5TaXRlRGF0YU1hbmFnZXIsIHVpbnQ2NF90IGNhbGxiYWNr SUQpCiB7CiAgICAgUGx1Z2luUHJvY2Vzc1Byb3h5KiBwbHVnaW5Qcm9jZXNzID0gZ2V0T3JDcmVh dGVQbHVnaW5Qcm9jZXNzKHBsdWdpbik7CiAgICAgcGx1Z2luUHJvY2Vzcy0+Z2V0U2l0ZXNXaXRo RGF0YSh3ZWJQbHVnaW5TaXRlRGF0YU1hbmFnZXIsIGNhbGxiYWNrSUQpOwogfQogCi12b2lkIFBs dWdpblByb2Nlc3NNYW5hZ2VyOjpjbGVhclNpdGVEYXRhKGNvbnN0IFBsdWdpbkluZm9TdG9yZTo6 UGx1Z2luJiBwbHVnaW4sIFdlYlBsdWdpblNpdGVEYXRhTWFuYWdlciogd2ViUGx1Z2luU2l0ZURh dGFNYW5hZ2VyLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgc2l0ZXMsIHVpbnQ2NF90IGZsYWdzLCB1 aW50NjRfdCBtYXhBZ2VJblNlY29uZHMsIHVpbnQ2NF90IGNhbGxiYWNrSUQpCit2b2lkIFBsdWdp blByb2Nlc3NNYW5hZ2VyOjpjbGVhclNpdGVEYXRhKGNvbnN0IFBsdWdpbk1vZHVsZUluZm8mIHBs dWdpbiwgV2ViUGx1Z2luU2l0ZURhdGFNYW5hZ2VyKiB3ZWJQbHVnaW5TaXRlRGF0YU1hbmFnZXIs IGNvbnN0IFZlY3RvcjxTdHJpbmc+JiBzaXRlcywgdWludDY0X3QgZmxhZ3MsIHVpbnQ2NF90IG1h eEFnZUluU2Vjb25kcywgdWludDY0X3QgY2FsbGJhY2tJRCkKIHsKICAgICBQbHVnaW5Qcm9jZXNz UHJveHkqIHBsdWdpblByb2Nlc3MgPSBnZXRPckNyZWF0ZVBsdWdpblByb2Nlc3MocGx1Z2luKTsK ICAgICBwbHVnaW5Qcm9jZXNzLT5jbGVhclNpdGVEYXRhKHdlYlBsdWdpblNpdGVEYXRhTWFuYWdl ciwgc2l0ZXMsIGZsYWdzLCBtYXhBZ2VJblNlY29uZHMsIGNhbGxiYWNrSUQpOwpAQCAtOTIsNyAr OTIsNyBAQCBQbHVnaW5Qcm9jZXNzUHJveHkqIFBsdWdpblByb2Nlc3NNYW5hZ2VyCiAgICAgcmV0 dXJuIDA7CiB9CiAKLVBsdWdpblByb2Nlc3NQcm94eSogUGx1Z2luUHJvY2Vzc01hbmFnZXI6Omdl dE9yQ3JlYXRlUGx1Z2luUHJvY2Vzcyhjb25zdCBQbHVnaW5JbmZvU3RvcmU6OlBsdWdpbiYgcGx1 Z2luKQorUGx1Z2luUHJvY2Vzc1Byb3h5KiBQbHVnaW5Qcm9jZXNzTWFuYWdlcjo6Z2V0T3JDcmVh dGVQbHVnaW5Qcm9jZXNzKGNvbnN0IFBsdWdpbk1vZHVsZUluZm8mIHBsdWdpbikKIHsKICAgICBp ZiAoUGx1Z2luUHJvY2Vzc1Byb3h5KiBwbHVnaW5Qcm9jZXNzID0gcGx1Z2luUHJvY2Vzc1dpdGhQ YXRoKHBsdWdpbi5wYXRoKSkKICAgICAgICAgcmV0dXJuIHBsdWdpblByb2Nlc3M7CkluZGV4OiBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm9jZXNzTWFuYWdlci5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb2Nl c3NNYW5hZ2VyLmgJKHJldmlzaW9uIDg4ODExKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1BsdWdpbnMvUGx1Z2luUHJvY2Vzc01hbmFnZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMjgsNyAr MjgsNyBAQAogCiAjaWYgRU5BQkxFKFBMVUdJTl9QUk9DRVNTKQogCi0jaW5jbHVkZSAiUGx1Z2lu SW5mb1N0b3JlLmgiCisjaW5jbHVkZSAiUGx1Z2luTW9kdWxlSW5mby5oIgogI2luY2x1ZGUgIldl YlByb2Nlc3NQcm94eU1lc3NhZ2VzLmgiCiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KICNpbmNs dWRlIDx3dGYvTm9uY29weWFibGUuaD4KQEAgLTUwLDE4ICs1MCwxOCBAQCBjbGFzcyBQbHVnaW5Q cm9jZXNzTWFuYWdlciB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFBsdWdpblByb2Nlc3NNYW5hZ2Vy JiBzaGFyZWQoKTsKIAotICAgIHZvaWQgZ2V0UGx1Z2luUHJvY2Vzc0Nvbm5lY3Rpb24oUGx1Z2lu SW5mb1N0b3JlJiwgY29uc3QgU3RyaW5nJiBwbHVnaW5QYXRoLCBQYXNzUmVmUHRyPE1lc3NhZ2Vz OjpXZWJQcm9jZXNzUHJveHk6OkdldFBsdWdpblByb2Nlc3NDb25uZWN0aW9uOjpEZWxheWVkUmVw bHk+KTsKKyAgICB2b2lkIGdldFBsdWdpblByb2Nlc3NDb25uZWN0aW9uKGNvbnN0IFBsdWdpbklu Zm9TdG9yZSYsIGNvbnN0IFN0cmluZyYgcGx1Z2luUGF0aCwgUGFzc1JlZlB0cjxNZXNzYWdlczo6 V2ViUHJvY2Vzc1Byb3h5OjpHZXRQbHVnaW5Qcm9jZXNzQ29ubmVjdGlvbjo6RGVsYXllZFJlcGx5 Pik7CiAgICAgdm9pZCByZW1vdmVQbHVnaW5Qcm9jZXNzUHJveHkoUGx1Z2luUHJvY2Vzc1Byb3h5 Kik7CiAKLSAgICB2b2lkIGdldFNpdGVzV2l0aERhdGEoY29uc3QgUGx1Z2luSW5mb1N0b3JlOjpQ bHVnaW4mLCBXZWJQbHVnaW5TaXRlRGF0YU1hbmFnZXIqLCB1aW50NjRfdCBjYWxsYmFja0lEKTsK LSAgICB2b2lkIGNsZWFyU2l0ZURhdGEoY29uc3QgUGx1Z2luSW5mb1N0b3JlOjpQbHVnaW4mLCBX ZWJQbHVnaW5TaXRlRGF0YU1hbmFnZXIqLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgc2l0ZXMsIHVp bnQ2NF90IGZsYWdzLCB1aW50NjRfdCBtYXhBZ2VJblNlY29uZHMsIHVpbnQ2NF90IGNhbGxiYWNr SUQpOworICAgIHZvaWQgZ2V0U2l0ZXNXaXRoRGF0YShjb25zdCBQbHVnaW5Nb2R1bGVJbmZvJiwg V2ViUGx1Z2luU2l0ZURhdGFNYW5hZ2VyKiwgdWludDY0X3QgY2FsbGJhY2tJRCk7CisgICAgdm9p ZCBjbGVhclNpdGVEYXRhKGNvbnN0IFBsdWdpbk1vZHVsZUluZm8mLCBXZWJQbHVnaW5TaXRlRGF0 YU1hbmFnZXIqLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgc2l0ZXMsIHVpbnQ2NF90IGZsYWdzLCB1 aW50NjRfdCBtYXhBZ2VJblNlY29uZHMsIHVpbnQ2NF90IGNhbGxiYWNrSUQpOwogCiAgICAgdm9p ZCBwbHVnaW5TeW5jTWVzc2FnZVNlbmRUaW1lZE91dChjb25zdCBTdHJpbmcmIHBsdWdpblBhdGgp OwogCiBwcml2YXRlOgogICAgIFBsdWdpblByb2Nlc3NNYW5hZ2VyKCk7CiAKLSAgICBQbHVnaW5Q cm9jZXNzUHJveHkqIGdldE9yQ3JlYXRlUGx1Z2luUHJvY2Vzcyhjb25zdCBQbHVnaW5JbmZvU3Rv cmU6OlBsdWdpbiYpOworICAgIFBsdWdpblByb2Nlc3NQcm94eSogZ2V0T3JDcmVhdGVQbHVnaW5Q cm9jZXNzKGNvbnN0IFBsdWdpbk1vZHVsZUluZm8mKTsKICAgICBQbHVnaW5Qcm9jZXNzUHJveHkq IHBsdWdpblByb2Nlc3NXaXRoUGF0aChjb25zdCBTdHJpbmcmIHBsdWdpblBhdGgpOwogCiAgICAg VmVjdG9yPFBsdWdpblByb2Nlc3NQcm94eSo+IG1fcGx1Z2luUHJvY2Vzc2VzOwpJbmRleDogU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vzc1Byb3h5LmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm9jZXNz UHJveHkuY3BwCShyZXZpc2lvbiA4ODgxMSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Q bHVnaW5zL1BsdWdpblByb2Nlc3NQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ0LDcgKzQ0 LDcgQEAKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLVBhc3NPd25QdHI8UGx1Z2luUHJvY2Vzc1By b3h5PiBQbHVnaW5Qcm9jZXNzUHJveHk6OmNyZWF0ZShQbHVnaW5Qcm9jZXNzTWFuYWdlciogUGx1 Z2luUHJvY2Vzc01hbmFnZXIsIGNvbnN0IFBsdWdpbkluZm9TdG9yZTo6UGx1Z2luJiBwbHVnaW5J bmZvKQorUGFzc093blB0cjxQbHVnaW5Qcm9jZXNzUHJveHk+IFBsdWdpblByb2Nlc3NQcm94eTo6 Y3JlYXRlKFBsdWdpblByb2Nlc3NNYW5hZ2VyKiBQbHVnaW5Qcm9jZXNzTWFuYWdlciwgY29uc3Qg UGx1Z2luTW9kdWxlSW5mbyYgcGx1Z2luSW5mbykKIHsKICAgICByZXR1cm4gYWRvcHRQdHIobmV3 IFBsdWdpblByb2Nlc3NQcm94eShQbHVnaW5Qcm9jZXNzTWFuYWdlciwgcGx1Z2luSW5mbykpOwog fQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vzc1By b3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1 Z2luUHJvY2Vzc1Byb3h5LmgJKHJldmlzaW9uIDg4ODExKQorKysgU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vzc1Byb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTI5 LDcgKzI5LDcgQEAKICNpZiBFTkFCTEUoUExVR0lOX1BST0NFU1MpCiAKICNpbmNsdWRlICJDb25u ZWN0aW9uLmgiCi0jaW5jbHVkZSAiUGx1Z2luSW5mb1N0b3JlLmgiCisjaW5jbHVkZSAiUGx1Z2lu TW9kdWxlSW5mby5oIgogI2luY2x1ZGUgIlByb2Nlc3NMYXVuY2hlci5oIgogI2luY2x1ZGUgIldl YlByb2Nlc3NQcm94eU1lc3NhZ2VzLmgiCiAjaW5jbHVkZSA8d3RmL0RlcXVlLmg+CkBAIC01NCwx MCArNTQsMTAgQEAgc3RydWN0IFBsdWdpblByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnM7CiAKIGNs YXNzIFBsdWdpblByb2Nlc3NQcm94eSA6IENvcmVJUEM6OkNvbm5lY3Rpb246OkNsaWVudCwgUHJv Y2Vzc0xhdW5jaGVyOjpDbGllbnQgewogcHVibGljOgotICAgIHN0YXRpYyBQYXNzT3duUHRyPFBs dWdpblByb2Nlc3NQcm94eT4gY3JlYXRlKFBsdWdpblByb2Nlc3NNYW5hZ2VyKiwgY29uc3QgUGx1 Z2luSW5mb1N0b3JlOjpQbHVnaW4mKTsKKyAgICBzdGF0aWMgUGFzc093blB0cjxQbHVnaW5Qcm9j ZXNzUHJveHk+IGNyZWF0ZShQbHVnaW5Qcm9jZXNzTWFuYWdlciosIGNvbnN0IFBsdWdpbk1vZHVs ZUluZm8mKTsKICAgICB+UGx1Z2luUHJvY2Vzc1Byb3h5KCk7CiAKLSAgICBjb25zdCBQbHVnaW5J bmZvU3RvcmU6OlBsdWdpbiYgcGx1Z2luSW5mbygpIGNvbnN0IHsgcmV0dXJuIG1fcGx1Z2luSW5m bzsgfQorICAgIGNvbnN0IFBsdWdpbk1vZHVsZUluZm8mIHBsdWdpbkluZm8oKSBjb25zdCB7IHJl dHVybiBtX3BsdWdpbkluZm87IH0KIAogICAgIC8vIEFza3MgdGhlIHBsdWctaW4gcHJvY2VzcyB0 byBjcmVhdGUgYSBuZXcgY29ubmVjdGlvbiB0byBhIHdlYiBwcm9jZXNzLiBUaGUgY29ubmVjdGlv biBpZGVudGlmaWVyIHdpbGwgYmUgCiAgICAgLy8gZW5jb2RlZCBpbiB0aGUgZ2l2ZW4gYXJndW1l bnQgZW5jb2RlciBhbmQgc2VudCBiYWNrIHRvIHRoZSBjb25uZWN0aW9uIG9mIHRoZSBnaXZlbiB3 ZWIgcHJvY2Vzcy4KQEAgLTc0LDE0ICs3NCwxNCBAQCBwdWJsaWM6CiAKICNpZiBQTEFURk9STShN QUMpCiAgICAgLy8gUmV0dXJucyB3aGV0aGVyIHRoZSBwbHVnLWluIG5lZWRzIHRoZSBoZWFwIHRv IGJlIG1hcmtlZCBleGVjdXRhYmxlLgotICAgIHN0YXRpYyBib29sIHBsdWdpbk5lZWRzRXhlY3V0 YWJsZUhlYXAoY29uc3QgUGx1Z2luSW5mb1N0b3JlOjpQbHVnaW4mKTsKKyAgICBzdGF0aWMgYm9v bCBwbHVnaW5OZWVkc0V4ZWN1dGFibGVIZWFwKGNvbnN0IFBsdWdpbk1vZHVsZUluZm8mKTsKIAog ICAgIC8vIENyZWF0ZXMgYSBwcm9wZXJ0eSBsaXN0IGluIH4vTGlicmFyeS9QcmVmZXJlbmNlcyB0 aGF0IGNvbnRhaW5zIGFsbCB0aGUgTUlNRSB0eXBlcyBzdXBwb3J0ZWQgYnkgdGhlIHBsdWctaW4u Ci0gICAgc3RhdGljIGJvb2wgY3JlYXRlUHJvcGVydHlMaXN0RmlsZShjb25zdCBQbHVnaW5JbmZv U3RvcmU6OlBsdWdpbiYpOworICAgIHN0YXRpYyBib29sIGNyZWF0ZVByb3BlcnR5TGlzdEZpbGUo Y29uc3QgUGx1Z2luTW9kdWxlSW5mbyYpOwogI2VuZGlmCiAKIHByaXZhdGU6Ci0gICAgUGx1Z2lu UHJvY2Vzc1Byb3h5KFBsdWdpblByb2Nlc3NNYW5hZ2VyKiwgY29uc3QgUGx1Z2luSW5mb1N0b3Jl OjpQbHVnaW4mKTsKKyAgICBQbHVnaW5Qcm9jZXNzUHJveHkoUGx1Z2luUHJvY2Vzc01hbmFnZXIq LCBjb25zdCBQbHVnaW5Nb2R1bGVJbmZvJik7CiAKICAgICB2b2lkIHBsdWdpblByb2Nlc3NDcmFz aGVkT3JGYWlsZWRUb0xhdW5jaCgpOwogCkBAIC0xMjQsNyArMTI0LDcgQEAgcHJpdmF0ZToKICAg ICBQbHVnaW5Qcm9jZXNzTWFuYWdlciogbV9wbHVnaW5Qcm9jZXNzTWFuYWdlcjsKICAgICAKICAg ICAvLyBJbmZvcm1hdGlvbiBhYm91dCB0aGUgcGx1Zy1pbi4KLSAgICBQbHVnaW5JbmZvU3RvcmU6 OlBsdWdpbiBtX3BsdWdpbkluZm87CisgICAgUGx1Z2luTW9kdWxlSW5mbyBtX3BsdWdpbkluZm87 CiAKICAgICAvLyBUaGUgY29ubmVjdGlvbiB0byB0aGUgcGx1Zy1pbiBob3N0IHByb2Nlc3MuCiAg ICAgUmVmUHRyPENvcmVJUEM6OkNvbm5lY3Rpb24+IG1fY29ubmVjdGlvbjsKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL21hYy9QbHVnaW5Qcm9jZXNzUHJveHlNYWMubW0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvbWFjL1BsdWdp blByb2Nlc3NQcm94eU1hYy5tbQkocmV2aXNpb24gODg4MTEpCisrKyBTb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvUGx1Z2lucy9tYWMvUGx1Z2luUHJvY2Vzc1Byb3h5TWFjLm1tCSh3b3JraW5nIGNv cHkpCkBAIC01Myw3ICs1Myw3IEBAIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogCiBuYW1lc3Bh Y2UgV2ViS2l0IHsKICAgICAKLWJvb2wgUGx1Z2luUHJvY2Vzc1Byb3h5OjpwbHVnaW5OZWVkc0V4 ZWN1dGFibGVIZWFwKGNvbnN0IFBsdWdpbkluZm9TdG9yZTo6UGx1Z2luJiBwbHVnaW5JbmZvKQor Ym9vbCBQbHVnaW5Qcm9jZXNzUHJveHk6OnBsdWdpbk5lZWRzRXhlY3V0YWJsZUhlYXAoY29uc3Qg UGx1Z2luTW9kdWxlSW5mbyYgcGx1Z2luSW5mbykKIHsKICAgICBzdGF0aWMgYm9vbCBmb3JjZU5v bmV4ZWN1dGFibGVIZWFwRm9yUGx1Z2lucyA9IFtbTlNVc2VyRGVmYXVsdHMgc3RhbmRhcmRVc2Vy RGVmYXVsdHNdIGJvb2xGb3JLZXk6QCJGb3JjZU5vbmV4ZWN1dGFibGVIZWFwRm9yUGx1Z2lucyJd OwogICAgIGlmIChmb3JjZU5vbmV4ZWN1dGFibGVIZWFwRm9yUGx1Z2lucykKQEAgLTY1LDcgKzY1 LDcgQEAgYm9vbCBQbHVnaW5Qcm9jZXNzUHJveHk6OnBsdWdpbk5lZWRzRXhlYwogICAgIHJldHVy biB0cnVlOwogfQogCi1ib29sIFBsdWdpblByb2Nlc3NQcm94eTo6Y3JlYXRlUHJvcGVydHlMaXN0 RmlsZShjb25zdCBQbHVnaW5JbmZvU3RvcmU6OlBsdWdpbiYgcGx1Z2luKQorYm9vbCBQbHVnaW5Q cm9jZXNzUHJveHk6OmNyZWF0ZVByb3BlcnR5TGlzdEZpbGUoY29uc3QgUGx1Z2luTW9kdWxlSW5m byYgcGx1Z2luKQogewogICAgIE5TQnVuZGxlICp3ZWJLaXQyQnVuZGxlID0gW05TQnVuZGxlIGJ1 bmRsZVdpdGhJZGVudGlmaWVyOkAiY29tLmFwcGxlLldlYktpdDIiXTsKICAgICBOU1N0cmluZyAq ZnJhbWV3b3Jrc1BhdGggPSBbW3dlYktpdDJCdW5kbGUgYnVuZGxlUGF0aF0gc3RyaW5nQnlEZWxl dGluZ0xhc3RQYXRoQ29tcG9uZW50XTsK