60865 2011-05-15 19:06:56 -0700 Pass the window NPObject identifier in the plug-in creation parameters 2011-05-15 20:30:06 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 404245 0 andersca 2011-05-15 19:06:56 -0700 Pass the window NPObject identifier in the plug-in creation parameters 404246 1 93598 andersca 2011-05-15 19:11:32 -0700 Created attachment 93598 Patch 404261 2 93598 mjs 2011-05-15 20:26:11 -0700 Comment on attachment 93598 Patch r=me 404262 3 andersca 2011-05-15 20:30:06 -0700 Committed r86522: <http://trac.webkit.org/changeset/86522> 93598 2011-05-15 19:11:32 -0700 2011-05-15 20:26:11 -0700 Patch bug-60865-20110515191131.patch text/plain 10493 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg2NTE5KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzkgQEAKKzIwMTEtMDUtMTUgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBQYXNzIHRoZSB3aW5kb3cgTlBPYmplY3QgaWRlbnRpZmll ciBpbiB0aGUgcGx1Zy1pbiBjcmVhdGlvbiBwYXJhbWV0ZXJzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MDg2NQorCisgICAgICAgIFRoaXMgYXZvaWRz IGEgc3luY2hyb25vdXMgY2FsbCB3aGVuIHRoZSBwbHVnLWluIHdhbnRzIHRvIGdldCB0aGUgTlBP YmplY3QgdGhhdAorICAgICAgICBjb3JyZXNwb25kcyB0byB0aGUgd2luZG93LgorCisgICAgICAg ICogUGx1Z2luUHJvY2Vzcy9QbHVnaW5Db250cm9sbGVyUHJveHkuY3BwOgorICAgICAgICAoV2Vi S2l0OjpQbHVnaW5Db250cm9sbGVyUHJveHk6OmluaXRpYWxpemUpOgorICAgICAgICBDaGFuZ2Ug dGhpcyB0byB0YWtlIHRoZSBQbHVnaW5DcmVhdGlvblBhcmFtZXRlcnMuIEluaXRpYWxpemUgdGhl IHdpbmRvdyBOUE9iamVjdC4KKworICAgICAgICAoV2ViS2l0OjpQbHVnaW5Db250cm9sbGVyUHJv eHk6OndpbmRvd1NjcmlwdE5QT2JqZWN0KToKKyAgICAgICAgSnVzdCByZXR1cm4gdGhlIHdpbmRv dyBOUE9iamVjdDsgaXQncyBhbHJlYWR5IGJlZW4gaW5pdGlhbGl6ZWQuCisKKyAgICAgICAgKiBQ bHVnaW5Qcm9jZXNzL1BsdWdpbkNvbnRyb2xsZXJQcm94eS5oOgorICAgICAgICAqIFBsdWdpblBy b2Nlc3MvUGx1Z2luQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGx1 Z2luQ3JlYXRpb25QYXJhbWV0ZXJzOjpQbHVnaW5DcmVhdGlvblBhcmFtZXRlcnMpOgorICAgICAg ICAoV2ViS2l0OjpQbHVnaW5DcmVhdGlvblBhcmFtZXRlcnM6OmVuY29kZSk6CisgICAgICAgIChX ZWJLaXQ6OlBsdWdpbkNyZWF0aW9uUGFyYW1ldGVyczo6ZGVjb2RlKToKKyAgICAgICAgKiBQbHVn aW5Qcm9jZXNzL1BsdWdpbkNyZWF0aW9uUGFyYW1ldGVycy5oOgorICAgICAgICBBZGQgdGhlIHdp bmRvdyBOUE9iamVjdCBJRC4KKworICAgICAgICAqIFBsdWdpblByb2Nlc3MvV2ViUHJvY2Vzc0Nv bm5lY3Rpb24uY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzQ29ubmVjdGlvbjo6Y3Jl YXRlUGx1Z2luKToKKyAgICAgICAgUGFzcyB0aGUgY3JlYXRpb24gcGFyYW1ldGVycyB0byBQbHVn aW5Db250cm9sbGVyUHJveHk6OmluaXRpYWxpemUuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1Bs dWdpbnMvUGx1Z2luUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5Qcm94eTo6aW5p dGlhbGl6ZSk6CisgICAgICAgIEluaXRpYWxpemUgdGhlIHdpbmRvdyBOUE9iamVjdCBJRC4KKwor ICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm94eS5tZXNzYWdlcy5pbjoKKyAg ICAgICAgUmVtb3ZlIHRoZSBHZXRXaW5kb3dTY3JpcHROUE9iamVjdCBtZXNzYWdlLgorCiAyMDEx LTA1LTE1ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgR2VvZmZyZXkgR2FyZW4uCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9QbHVnaW5Q cm9jZXNzL1BsdWdpbkNvbnRyb2xsZXJQcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Db250cm9sbGVyUHJveHkuY3BwCShyZXZpc2lvbiA4 NjUxNCkKKysrIFNvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luQ29udHJvbGxlclBy b3h5LmNwcAkod29ya2luZyBjb3B5KQpAQCAtODUsNyArODUsNyBAQCBQbHVnaW5Db250cm9sbGVy UHJveHk6On5QbHVnaW5Db250cm9sbGVyCiAgICAgICAgIHJlbGVhc2VOUE9iamVjdChtX3BsdWdp bkVsZW1lbnROUE9iamVjdCk7CiB9CiAKLWJvb2wgUGx1Z2luQ29udHJvbGxlclByb3h5Ojppbml0 aWFsaXplKGNvbnN0IFBsdWdpbjo6UGFyYW1ldGVycyYgcGFyYW1ldGVycykKK2Jvb2wgUGx1Z2lu Q29udHJvbGxlclByb3h5Ojppbml0aWFsaXplKGNvbnN0IFBsdWdpbkNyZWF0aW9uUGFyYW1ldGVy cyYgY3JlYXRpb25QYXJhbWV0ZXJzKQogewogICAgIEFTU0VSVCghbV9wbHVnaW4pOwogCkBAIC05 Niw3ICs5NiwxMCBAQCBib29sIFBsdWdpbkNvbnRyb2xsZXJQcm94eTo6aW5pdGlhbGl6ZShjCiAg ICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKLSAgICBpZiAoIW1fcGx1Z2luLT5pbml0aWFs aXplKHRoaXMsIHBhcmFtZXRlcnMpKSB7CisgICAgbV93aW5kb3dOUE9iamVjdCA9IG1fY29ubmVj dGlvbi0+bnBSZW1vdGVPYmplY3RNYXAoKS0+Y3JlYXRlTlBPYmplY3RQcm94eShjcmVhdGlvblBh cmFtZXRlcnMud2luZG93TlBPYmplY3RJRCwgbV9wbHVnaW4uZ2V0KCkpOworICAgIEFTU0VSVCht X3dpbmRvd05QT2JqZWN0KTsKKworICAgIGlmICghbV9wbHVnaW4tPmluaXRpYWxpemUodGhpcywg Y3JlYXRpb25QYXJhbWV0ZXJzLnBhcmFtZXRlcnMpKSB7CiAgICAgICAgIC8vIEdldCB0aGUgcGx1 Zy1pbiBzbyB3ZSBjYW4gcGFzcyBpdCB0byByZW1vdmVQbHVnaW5Db250cm9sbGVyUHJveHkuIFRo ZSBwb2ludGVyIGlzIG9ubHkKICAgICAgICAgLy8gdXNlZCBhcyBhbiBpZGVudGlmaWVyIHNvIGl0 J3MgT0sgdG8ganVzdCBnZXQgYSB3ZWFrIHJlZmVyZW5jZS4KICAgICAgICAgUGx1Z2luKiBwbHVn aW4gPSBtX3BsdWdpbi5nZXQoKTsKQEAgLTIyOSwxOSArMjMyLDYgQEAgdm9pZCBQbHVnaW5Db250 cm9sbGVyUHJveHk6OmNhbmNlbE1hbnVhbAogCiBOUE9iamVjdCogUGx1Z2luQ29udHJvbGxlclBy b3h5Ojp3aW5kb3dTY3JpcHROUE9iamVjdCgpCiB7Ci0gICAgaWYgKCFtX3dpbmRvd05QT2JqZWN0 KSB7Ci0gICAgICAgIHVpbnQ2NF90IHdpbmRvd1NjcmlwdE5QT2JqZWN0SUQgPSAwOwotCi0gICAg ICAgIGlmICghbV9jb25uZWN0aW9uLT5jb25uZWN0aW9uKCktPnNlbmRTeW5jKE1lc3NhZ2VzOjpQ bHVnaW5Qcm94eTo6R2V0V2luZG93U2NyaXB0TlBPYmplY3QoKSwgTWVzc2FnZXM6OlBsdWdpblBy b3h5OjpHZXRXaW5kb3dTY3JpcHROUE9iamVjdDo6UmVwbHkod2luZG93U2NyaXB0TlBPYmplY3RJ RCksIG1fcGx1Z2luSW5zdGFuY2VJRCkpCi0gICAgICAgICAgICByZXR1cm4gMDsKLQotICAgICAg ICBpZiAoIXdpbmRvd1NjcmlwdE5QT2JqZWN0SUQpCi0gICAgICAgICAgICByZXR1cm4gMDsKLQot ICAgICAgICBtX3dpbmRvd05QT2JqZWN0ID0gbV9jb25uZWN0aW9uLT5ucFJlbW90ZU9iamVjdE1h cCgpLT5jcmVhdGVOUE9iamVjdFByb3h5KHdpbmRvd1NjcmlwdE5QT2JqZWN0SUQsIG1fcGx1Z2lu LmdldCgpKTsKLSAgICAgICAgQVNTRVJUKG1fd2luZG93TlBPYmplY3QpOwotICAgIH0KLQogICAg IHJldGFpbk5QT2JqZWN0KG1fd2luZG93TlBPYmplY3QpOwogICAgIHJldHVybiBtX3dpbmRvd05Q T2JqZWN0OwogfQpJbmRleDogU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Db250 cm9sbGVyUHJveHkuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNz L1BsdWdpbkNvbnRyb2xsZXJQcm94eS5oCShyZXZpc2lvbiA4NjUxNCkKKysrIFNvdXJjZS9XZWJL aXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luQ29udHJvbGxlclByb3h5LmgJKHdvcmtpbmcgY29weSkK QEAgLTYxLDcgKzYxLDcgQEAgcHVibGljOgogCiAgICAgdWludDY0X3QgcGx1Z2luSW5zdGFuY2VJ RCgpIGNvbnN0IHsgcmV0dXJuIG1fcGx1Z2luSW5zdGFuY2VJRDsgfQogCi0gICAgYm9vbCBpbml0 aWFsaXplKGNvbnN0IFBsdWdpbjo6UGFyYW1ldGVycyYpOworICAgIGJvb2wgaW5pdGlhbGl6ZShj b25zdCBQbHVnaW5DcmVhdGlvblBhcmFtZXRlcnMmKTsKICAgICB2b2lkIGRlc3Ryb3koKTsKIAog ICAgIHZvaWQgZGlkUmVjZWl2ZVBsdWdpbkNvbnRyb2xsZXJQcm94eU1lc3NhZ2UoQ29yZUlQQzo6 Q29ubmVjdGlvbiosIENvcmVJUEM6Ok1lc3NhZ2VJRCwgQ29yZUlQQzo6QXJndW1lbnREZWNvZGVy Kik7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1BsdWdpbkNyZWF0aW9uUGFy YW1ldGVycy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9Q bHVnaW5DcmVhdGlvblBhcmFtZXRlcnMuY3BwCShyZXZpc2lvbiA4NjUxNCkKKysrIFNvdXJjZS9X ZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMzQsNiArMzQsNyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIAogUGx1Z2luQ3Jl YXRpb25QYXJhbWV0ZXJzOjpQbHVnaW5DcmVhdGlvblBhcmFtZXRlcnMoKQogICAgIDogcGx1Z2lu SW5zdGFuY2VJRCgwKQorICAgICwgd2luZG93TlBPYmplY3RJRCgwKQogICAgICwgaXNQcml2YXRl QnJvd3NpbmdFbmFibGVkKGZhbHNlKQogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykK ICAgICAsIGlzQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0VuYWJsZWQoZmFsc2UpCkBAIC00NCw2ICs0 NSw3IEBAIFBsdWdpbkNyZWF0aW9uUGFyYW1ldGVyczo6UGx1Z2luQ3JlYXRpb24KIHZvaWQgUGx1 Z2luQ3JlYXRpb25QYXJhbWV0ZXJzOjplbmNvZGUoQ29yZUlQQzo6QXJndW1lbnRFbmNvZGVyKiBl bmNvZGVyKSBjb25zdAogewogICAgIGVuY29kZXItPmVuY29kZShwbHVnaW5JbnN0YW5jZUlEKTsK KyAgICBlbmNvZGVyLT5lbmNvZGUod2luZG93TlBPYmplY3RJRCk7CiAgICAgZW5jb2Rlci0+ZW5j b2RlKHBhcmFtZXRlcnMpOwogICAgIGVuY29kZXItPmVuY29kZSh1c2VyQWdlbnQpOwogICAgIGVu Y29kZXItPmVuY29kZShpc1ByaXZhdGVCcm93c2luZ0VuYWJsZWQpOwpAQCAtNTgsNiArNjAsOSBA QCBib29sIFBsdWdpbkNyZWF0aW9uUGFyYW1ldGVyczo6ZGVjb2RlKENvCiAgICAgaWYgKCFkZWNv ZGVyLT5kZWNvZGUocmVzdWx0LnBsdWdpbkluc3RhbmNlSUQpIHx8ICFyZXN1bHQucGx1Z2luSW5z dGFuY2VJRCkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCisgICAgaWYgKCFkZWNvZGVyLT5kZWNv ZGUocmVzdWx0LndpbmRvd05QT2JqZWN0SUQpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKICAg ICBpZiAoIWRlY29kZXItPmRlY29kZShyZXN1bHQucGFyYW1ldGVycykpCiAgICAgICAgIHJldHVy biBmYWxzZTsKIApJbmRleDogU291cmNlL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5DcmVh dGlvblBhcmFtZXRlcnMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9j ZXNzL1BsdWdpbkNyZWF0aW9uUGFyYW1ldGVycy5oCShyZXZpc2lvbiA4NjUxNCkKKysrIFNvdXJj ZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luQ3JlYXRpb25QYXJhbWV0ZXJzLmgJKHdvcmtp bmcgY29weSkKQEAgLTQ2LDYgKzQ2LDkgQEAgc3RydWN0IFBsdWdpbkNyZWF0aW9uUGFyYW1ldGVy cyB7CiAgICAgLy8gVGhlIHVuaXF1ZSBJRCBvZiB0aGlzIHBsdWctaW4gaW5zdGFuY2UuCiAgICAg dWludDY0X3QgcGx1Z2luSW5zdGFuY2VJRDsKIAorICAgIC8vIFRoZSBJRCBvZiB0aGUgd2luZG93 IE5QT2JqZWN0LgorICAgIHVpbnQ2NF90IHdpbmRvd05QT2JqZWN0SUQ7CisKICAgICAvLyBUaGUg cGFyYW1ldGVycyBwYXNzZWQgdG8gdGhlIHBsdWctaW4uCiAgICAgUGx1Z2luOjpQYXJhbWV0ZXJz IHBhcmFtZXRlcnM7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvV2ViUHJv Y2Vzc0Nvbm5lY3Rpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1BsdWdpblBy b2Nlc3MvV2ViUHJvY2Vzc0Nvbm5lY3Rpb24uY3BwCShyZXZpc2lvbiA4NjUxNCkKKysrIFNvdXJj ZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvV2ViUHJvY2Vzc0Nvbm5lY3Rpb24uY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0xNzMsNyArMTczLDcgQEAgdm9pZCBXZWJQcm9jZXNzQ29ubmVjdGlvbjo6Y3Jl YXRlUGx1Z2luKAogICAgIGFkZFBsdWdpbkNvbnRyb2xsZXJQcm94eShwbHVnaW5Db250cm9sbGVy UHJveHkucmVsZWFzZSgpKTsKIAogICAgIC8vIE5vdyB0cnkgdG8gaW5pdGlhbGl6ZSB0aGUgcGx1 Zy1pbi4KLSAgICByZXN1bHQgPSBwbHVnaW5Db250cm9sbGVyUHJveHlQdHItPmluaXRpYWxpemUo Y3JlYXRpb25QYXJhbWV0ZXJzLnBhcmFtZXRlcnMpOworICAgIHJlc3VsdCA9IHBsdWdpbkNvbnRy b2xsZXJQcm94eVB0ci0+aW5pdGlhbGl6ZShjcmVhdGlvblBhcmFtZXRlcnMpOwogCiAgICAgaWYg KCFyZXN1bHQpCiAgICAgICAgIHJldHVybjsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvUGx1Z2lucy9QbHVnaW5Qcm94eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb3h5LmNwcAkocmV2aXNpb24gODY1MTQpCisrKyBT b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJveHkuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0xMDEsNiArMTAxLDcgQEAgYm9vbCBQbHVnaW5Qcm94eTo6aW5pdGlhbGl6ZShQ bHVnaW5Db250cgogICAgIC8vIEFzayB0aGUgcGx1Zy1pbiBwcm9jZXNzIHRvIGNyZWF0ZSBhIHBs dWctaW4uCiAgICAgUGx1Z2luQ3JlYXRpb25QYXJhbWV0ZXJzIGNyZWF0aW9uUGFyYW1ldGVyczsK ICAgICBjcmVhdGlvblBhcmFtZXRlcnMucGx1Z2luSW5zdGFuY2VJRCA9IG1fcGx1Z2luSW5zdGFu Y2VJRDsKKyAgICBjcmVhdGlvblBhcmFtZXRlcnMud2luZG93TlBPYmplY3RJRCA9IHdpbmRvd05Q T2JqZWN0SUQoKTsKICAgICBjcmVhdGlvblBhcmFtZXRlcnMucGFyYW1ldGVycyA9IHBhcmFtZXRl cnM7CiAgICAgY3JlYXRpb25QYXJhbWV0ZXJzLnVzZXJBZ2VudCA9IHBsdWdpbkNvbnRyb2xsZXIt PnVzZXJBZ2VudCgpOwogICAgIGNyZWF0aW9uUGFyYW1ldGVycy5pc1ByaXZhdGVCcm93c2luZ0Vu YWJsZWQgPSBwbHVnaW5Db250cm9sbGVyLT5pc1ByaXZhdGVCcm93c2luZ0VuYWJsZWQoKTsKQEAg LTQxMCwxNiArNDExLDE2IEBAIHZvaWQgUGx1Z2luUHJveHk6OmdldEF1dGhlbnRpY2F0aW9uSW5m bygKICAgICByZXR1cm5WYWx1ZSA9IG1fcGx1Z2luQ29udHJvbGxlci0+Z2V0QXV0aGVudGljYXRp b25JbmZvKHByb3RlY3Rpb25TcGFjZSwgdXNlcm5hbWUsIHBhc3N3b3JkKTsKIH0KIAotdm9pZCBQ bHVnaW5Qcm94eTo6Z2V0V2luZG93U2NyaXB0TlBPYmplY3QodWludDY0X3QmIHdpbmRvd1Njcmlw dE5QT2JqZWN0SUQpCit1aW50NjRfdCBQbHVnaW5Qcm94eTo6d2luZG93TlBPYmplY3RJRCgpCiB7 CiAgICAgTlBPYmplY3QqIHdpbmRvd1NjcmlwdE5QT2JqZWN0ID0gbV9wbHVnaW5Db250cm9sbGVy LT53aW5kb3dTY3JpcHROUE9iamVjdCgpOwotICAgIGlmICghd2luZG93U2NyaXB0TlBPYmplY3Qp IHsKLSAgICAgICAgd2luZG93U2NyaXB0TlBPYmplY3RJRCA9IDA7Ci0gICAgICAgIHJldHVybjsK LSAgICB9CisgICAgaWYgKCF3aW5kb3dTY3JpcHROUE9iamVjdCkKKyAgICAgICAgcmV0dXJuIDA7 CiAKLSAgICB3aW5kb3dTY3JpcHROUE9iamVjdElEID0gbV9jb25uZWN0aW9uLT5ucFJlbW90ZU9i amVjdE1hcCgpLT5yZWdpc3Rlck5QT2JqZWN0KHdpbmRvd1NjcmlwdE5QT2JqZWN0LCB0aGlzKTsK KyAgICB1aW50NjRfdCB3aW5kb3dOUE9iamVjdElEID0gbV9jb25uZWN0aW9uLT5ucFJlbW90ZU9i amVjdE1hcCgpLT5yZWdpc3Rlck5QT2JqZWN0KHdpbmRvd1NjcmlwdE5QT2JqZWN0LCB0aGlzKTsK ICAgICByZWxlYXNlTlBPYmplY3Qod2luZG93U2NyaXB0TlBPYmplY3QpOworCisgICAgcmV0dXJu IHdpbmRvd05QT2JqZWN0SUQ7CiB9CiAKIHZvaWQgUGx1Z2luUHJveHk6OmdldFBsdWdpbkVsZW1l bnROUE9iamVjdCh1aW50NjRfdCYgcGx1Z2luRWxlbWVudE5QT2JqZWN0SUQpCkluZGV4OiBTb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJveHkuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJveHkuaAkocmV2aXNp b24gODY1MTQpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJv eHkuaAkod29ya2luZyBjb3B5KQpAQCAtMTA1LDYgKzEwNSw3IEBAIHByaXZhdGU6CiAgICAgdmly dHVhbCBQbHVnaW5Db250cm9sbGVyKiBjb250cm9sbGVyKCk7CiAKICAgICBib29sIG5lZWRzQmFj a2luZ1N0b3JlKCkgY29uc3Q7CisgICAgdWludDY0X3Qgd2luZG93TlBPYmplY3RJRCgpOwogCiAg ICAgLy8gTWVzc2FnZSBoYW5kbGVycy4KICAgICB2b2lkIGxvYWRVUkwodWludDY0X3QgcmVxdWVz dElELCBjb25zdCBTdHJpbmcmIG1ldGhvZCwgY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcsIGNvbnN0 IFN0cmluZyYgdGFyZ2V0LCBjb25zdCBXZWJDb3JlOjpIVFRQSGVhZGVyTWFwJiBoZWFkZXJGaWVs ZHMsIGNvbnN0IFZlY3Rvcjx1aW50OF90PiYgaHR0cEJvZHksIGJvb2wgYWxsb3dQb3B1cHMpOwpA QCAtMTEzLDcgKzExNCw2IEBAIHByaXZhdGU6CiAgICAgdm9pZCBjb29raWVzRm9yVVJMKGNvbnN0 IFN0cmluZyYgdXJsU3RyaW5nLCBTdHJpbmcmIGNvb2tpZVN0cmluZyk7CiAgICAgdm9pZCBzZXRD b29raWVzRm9yVVJMKGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nLCBjb25zdCBTdHJpbmcmIGNvb2tp ZVN0cmluZyk7CiAgICAgdm9pZCBnZXRBdXRoZW50aWNhdGlvbkluZm8oY29uc3QgV2ViQ29yZTo6 UHJvdGVjdGlvblNwYWNlJiwgYm9vbCYgcmV0dXJuVmFsdWUsIFN0cmluZyYgdXNlcm5hbWUsIFN0 cmluZyYgcGFzc3dvcmQpOwotICAgIHZvaWQgZ2V0V2luZG93U2NyaXB0TlBPYmplY3QodWludDY0 X3QmIHdpbmRvd1NjcmlwdE5QT2JqZWN0SUQpOwogICAgIHZvaWQgZ2V0UGx1Z2luRWxlbWVudE5Q T2JqZWN0KHVpbnQ2NF90JiBwbHVnaW5FbGVtZW50TlBPYmplY3RJRCk7CiAgICAgdm9pZCBldmFs dWF0ZShjb25zdCBOUFZhcmlhbnREYXRhJiBucE9iamVjdEFzVmFyaWFudERhdGEsIGNvbnN0IFN0 cmluZyYgc2NyaXB0U3RyaW5nLCBib29sIGFsbG93UG9wdXBzLCBib29sJiByZXR1cm5WYWx1ZSwg TlBWYXJpYW50RGF0YSYgcmVzdWx0RGF0YSk7CiAgICAgdm9pZCBjYW5jZWxTdHJlYW1Mb2FkKHVp bnQ2NF90IHN0cmVhbUlEKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lu cy9QbHVnaW5Qcm94eS5tZXNzYWdlcy5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJveHkubWVzc2FnZXMuaW4JKHJldmlzaW9uIDg2NTE0 KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb3h5Lm1lc3Nh Z2VzLmluCSh3b3JraW5nIGNvcHkpCkBAIC00MSw5ICs0MSw2IEBAIG1lc3NhZ2VzIC0+IFBsdWdp blByb3h5IHsKICAgICAjIEdldHMgdGhlIGF1dGhlbnRpY2F0aW9uIGluZm8gZm9yIHRoZSBnaXZl biBwcm90ZWN0aW9uIHNwYWNlLgogICAgIEdldEF1dGhlbnRpY2F0aW9uSW5mbyhXZWJDb3JlOjpQ cm90ZWN0aW9uU3BhY2UgcHJvdGVjdGlvblNwYWNlKSAtPiAoYm9vbCByZXR1cm5WYWx1ZSwgV1RG OjpTdHJpbmcgdXNlcm5hbWUsIFdURjo6U3RyaW5nIHBhc3N3b3JkKQogCi0gICAgIyBHZXRzIGEg cmVmZXJlbmNlIHRvIHRoZSB3aW5kb3cgTlBPYmplY3QuCi0gICAgR2V0V2luZG93U2NyaXB0TlBP YmplY3QoKSAtPiAodWludDY0X3Qgd2luZG93U2NyaXB0TlBPYmplY3RJRCkKLQogICAgICMgR2V0 cyBhIHJlZmVyZW5jZSB0byB0aGUgcGx1Zy1pbiBlbGVtZW50IE5QT2JqZWN0LgogICAgIEdldFBs dWdpbkVsZW1lbnROUE9iamVjdCgpIC0+ICh1aW50NjRfdCBwbHVnaW5FbGVtZW50TlBPYmplY3RJ RCkKIAo=