145314 2015-05-22 13:23:38 -0700 Rename MediaPlaybackRequiresUserGesture 2015-05-22 23:22:40 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 145239 1 jonlee jonlee andersca ap eric.carlson jeremyj-wk jer.noble oldest_to_newest 1096930 0 jonlee 2015-05-22 13:23:38 -0700 Rename MediaPlaybackRequiresUserGesture 1096949 1 253605 jonlee 2015-05-22 14:16:03 -0700 Created attachment 253605 Patch 1097001 2 jonlee 2015-05-22 16:56:49 -0700 Committed r184802: <http://trac.webkit.org/changeset/184802> 1097063 3 ap 2015-05-22 22:55:29 -0700 This change broke several tests, I'll try to fix. Also, it should really have included a dependency checking fix, so that EWS would test it. 1097065 4 jonlee 2015-05-22 23:22:40 -0700 Thanks for fixing, Alexey! 253605 2015-05-22 14:16:03 -0700 2015-05-22 14:21:07 -0700 Patch bug-145314-20150522141557.patch text/plain 18854 jonlee U3VidmVyc2lvbiBSZXZpc2lvbjogMTg0Nzg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTI0NTk3NjA2YjI0OWJi ZDE5NmYzMjE4MTkzYzcxODRjN2ZhMzFmNC4uNWMyYmUwNjFjMTYyYjllOTU4YzNiZDIxOTBlZjZm ODcyY2UyN2MyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE1LTA1LTIyICBKb24g TGVlICA8am9ubGVlQGFwcGxlLmNvbT4KKworICAgICAgICBSZW5hbWUgTWVkaWFQbGF5YmFja1Jl cXVpcmVzVXNlckdlc3R1cmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE0NTMxNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEluIHByZXBhcmF0aW9uIGZvciBhbiBBUEkgcmVuYW1lLCB1cGRhdGUgaW50ZXJu YWwgc3ltYm9scyBmcm9tIG1lZGlhUGxheWJhY2tSZXF1aXJlc1VzZXJHZXN0dXJlCisgICAgICAg IHRvIHJlcXVpcmVzVXNlckdlc3R1cmVGb3JNZWRpYVBsYXliYWNrLgorCisgICAgICAgICogcGFn ZS9TZXR0aW5ncy5jcHA6IHVwZGF0ZSBzdGF0aWMgY29uc3QgZGVmYXVsdCB2YXJpYWJsZSBuYW1l LgorICAgICAgICAqIHBhZ2UvU2V0dGluZ3MuaW46IHVwZGF0ZSB0aGUgc2V0dGluZyBuYW1lIGFu ZCBzdGF0aWMgY29uc3QgZGVmYXVsdCB2YXJpYWJsZSBuYW1lLgorCisgICAgICAgICogTW9kdWxl cy93ZWJhdWRpby9BdWRpb0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QXVkaW9Db250 ZXh0Ojpjb25zdHJ1Y3RDb21tb24pOiBVcGRhdGUgc2V0dGluZ3MgY2FsbC4KKyAgICAgICAgKiBo dG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxl bWVudDo6SFRNTE1lZGlhRWxlbWVudCk6IERpdHRvLgorCiAyMDE1LTA1LTIyICBFcmljIENhcmxz b24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFtNYWNdIERldmljZSBwaWNr ZXIgbWVudSBzaG91bGQgYmUgcGVyc2lzdGVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9t YWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCmluZGV4IGQzNWQ0Y2U1 NTU1ZmYzYzEzNjdlNWUzZjE5YjIwNTdjZThkMDljZjEuLjYzZjZjMjE2ZDc0YzY1MzAwYjk4ZWE0 ZjM0MTIwYWIzNzU0MjkzOWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAx NS0wNS0yMiAgSm9uIExlZSAgPGpvbmxlZUBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuYW1lIE1l ZGlhUGxheWJhY2tSZXF1aXJlc1VzZXJHZXN0dXJlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDUzMTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBJbiBwcmVwYXJhdGlvbiBmb3IgYW4gQVBJIHJlbmFtZSwg dXBkYXRlIGludGVybmFsIHN5bWJvbHMgZnJvbSBtZWRpYVBsYXliYWNrUmVxdWlyZXNVc2VyR2Vz dHVyZQorICAgICAgICB0byByZXF1aXJlc1VzZXJHZXN0dXJlRm9yTWVkaWFQbGF5YmFjay4KKwor ICAgICAgICBObyBjaGFuZ2VzIGFyZSBiZWluZyBtYWRlIHRvIHRoZSBBUEkgaW4gdGhpcyBwYXRj aC4KKworICAgICAgICAqIFdlYlZpZXcvV2ViUHJlZmVyZW5jZUtleXNQcml2YXRlLmg6IFVwZGF0 ZSB0aGUgbmFtZSBvZiB0aGUga2V5LCBidXQgbm90IGl0cyB2YWx1ZSwgZm9yIGJhY2t3YXJkcwor ICAgICAgICBjb21wYXRpYmlsaXR5LgorICAgICAgICAqIFdlYlZpZXcvV2ViUHJlZmVyZW5jZXMu bW06CisgICAgICAgICgrW1dlYlByZWZlcmVuY2VzIGluaXRpYWxpemVdKTogVXBkYXRlIHRoZSBz eW1ib2wuCisgICAgICAgICgtW1dlYlByZWZlcmVuY2VzIG1lZGlhUGxheWJhY2tSZXF1aXJlc1Vz ZXJHZXN0dXJlXSk6IERpdHRvLiBUaGlzIHNldHRpbmcgd2lsbCBub3QgYmUgcmVuYW1lZAorICAg ICAgICBpbiBhIGZ1dHVyZSBwYXRjaC4KKyAgICAgICAgKC1bV2ViUHJlZmVyZW5jZXMgc2V0TWVk aWFQbGF5YmFja1JlcXVpcmVzVXNlckdlc3R1cmU6XSk6IERpdHRvLgorICAgICAgICAqIFdlYlZp ZXcvV2ViVmlldy5tbToKKyAgICAgICAgKC1bV2ViVmlldyBfcHJlZmVyZW5jZXNDaGFuZ2VkOl0p OiBVcGRhdGUgdGhlIGNhbGwgdG8gc2V0dGluZ3MuCisKIDIwMTUtMDUtMjIgIFRpbSBIb3J0b24g IDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIGFjdGlvbiBtZW51 IHN1cHBvcnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9X ZWJLaXQyL0NoYW5nZUxvZwppbmRleCBkOGE4NGNlNzYwZmFjNjA2NzIxZjVmZjgyYzA2MzNkNTRj YjQxZWI1Li4wYWI4MjZhMTdhNDMwZTk1M2IzNzEzZjBjNGEwZDhmM2RjMDZlZjQ2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTUtMDUtMjIgIEpvbiBMZWUgIDxqb25sZWVAYXBwbGUu Y29tPgorCisgICAgICAgIFJlbmFtZSBNZWRpYVBsYXliYWNrUmVxdWlyZXNVc2VyR2VzdHVyZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1MzE0CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gcHJlcGFy YXRpb24gZm9yIGFuIEFQSSByZW5hbWUsIHVwZGF0ZSBpbnRlcm5hbCBzeW1ib2xzIGZyb20gbWVk aWFQbGF5YmFja1JlcXVpcmVzVXNlckdlc3R1cmUKKyAgICAgICAgdG8gcmVxdWlyZXNVc2VyR2Vz dHVyZUZvck1lZGlhUGxheWJhY2suCisKKyAgICAgICAgTm8gY2hhbmdlcyBhcmUgYmVpbmcgbWFk ZSB0byB0aGUgQVBJIGluIHRoaXMgcGF0Y2guCisKKyAgICAgICAgKiBTaGFyZWQvV2ViUHJlZmVy ZW5jZXNEZWZpbml0aW9ucy5oOiBVcGRhdGUgdGhlIG5hbWUgb2YgdGhlIG1hY3JvIGFuZCB0aGUg c2V0dGluZy4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tQcmVmZXJlbmNlcy5jcHA6IFRo ZSBDIEFQSSB3aWxsIG5vdCBjaGFuZ2UgaW4gYSBmdXR1cmUgcGF0Y2guCisgICAgICAgIChXS1By ZWZlcmVuY2VzU2V0TWVkaWFQbGF5YmFja1JlcXVpcmVzVXNlckdlc3R1cmUpOiBVcGRhdGUgdGhl IGNhbGwgdG8gcHJlZmVyZW5jZXMuCisgICAgICAgIChXS1ByZWZlcmVuY2VzR2V0TWVkaWFQbGF5 YmFja1JlcXVpcmVzVXNlckdlc3R1cmUpOiBEaXR0by4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJ L0NvY29hL1dLV2ViVmlldy5tbToKKyAgICAgICAgKC1bV0tXZWJWaWV3IGluaXRXaXRoRnJhbWU6 Y29uZmlndXJhdGlvbjpdKTogVXBkYXRlIHRoZSBuYW1lIG9mIHRoZSBrZXkuCisgICAgICAgICog V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl Ojp1cGRhdGVQcmVmZXJlbmNlcyk6IERpdHRvLgorCiAyMDE1LTA1LTIyICBUaW0gSG9ydG9uICA8 dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBhY3Rpb24gbWVudSBz dXBwb3J0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL0F1ZGlv Q29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL0F1ZGlvQ29udGV4 dC5jcHAKaW5kZXggMGRjNjg1ZmY2YTJhYWE5M2IxNzVmNjE2NmQ3MDUwYWZkYWVhN2I1YS4uYzhm NmQ1MTM3MzQ2Y2ViOWE5MTBhNzk4MWNiMjg0MDJkZDAxYzVmZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRpby9BdWRpb0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vQXVkaW9Db250ZXh0LmNwcApAQCAtMTcxLDcgKzE3MSw3 IEBAIHZvaWQgQXVkaW9Db250ZXh0Ojpjb25zdHJ1Y3RDb21tb24oKQogICAgIG1fbGlzdGVuZXIg PSBBdWRpb0xpc3RlbmVyOjpjcmVhdGUoKTsKIAogI2lmIFBMQVRGT1JNKElPUykKLSAgICBpZiAo IWRvY3VtZW50KCktPnNldHRpbmdzKCkgfHwgZG9jdW1lbnQoKS0+c2V0dGluZ3MoKS0+bWVkaWFQ bGF5YmFja1JlcXVpcmVzVXNlckdlc3R1cmUoKSkKKyAgICBpZiAoIWRvY3VtZW50KCktPnNldHRp bmdzKCkgfHwgZG9jdW1lbnQoKS0+c2V0dGluZ3MoKS0+cmVxdWlyZXNVc2VyR2VzdHVyZUZvck1l ZGlhUGxheWJhY2soKSkKICAgICAgICAgYWRkQmVoYXZpb3JSZXN0cmljdGlvbihSZXF1aXJlVXNl ckdlc3R1cmVGb3JBdWRpb1N0YXJ0UmVzdHJpY3Rpb24pOwogICAgIGVsc2UKICAgICAgICAgbV9y ZXN0cmljdGlvbnMgPSBOb1Jlc3RyaWN0aW9uczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRp YUVsZW1lbnQuY3BwCmluZGV4IDYzZWQ0MjViMjBmMjc2NDE5MWVjNDE3Yjc2YWFiNWRlNjdhZGY5 MDQuLmYyZGY3MzlmNmVlM2M5ZjgyYmE5OGIzMjlmMmM3MTRkMjY3N2E3OGYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcApAQCAtMzY5LDEzICszNjksMTMgQEAgSFRN TE1lZGlhRWxlbWVudDo6SFRNTE1lZGlhRWxlbWVudChjb25zdCBRdWFsaWZpZWROYW1lJiB0YWdO YW1lLCBEb2N1bWVudCYgZG9jdW0KICAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGNsZWFuIHVwIGFu ZCBsb29rIHRvIGJldHRlciBtZXJnZSB0aGUgaU9TIGFuZCBub24taU9TIGNvZGUgYmVsb3cuCiAg ICAgU2V0dGluZ3MqIHNldHRpbmdzID0gZG9jdW1lbnQuc2V0dGluZ3MoKTsKICNpZiAhUExBVEZP Uk0oSU9TKQotICAgIGlmIChzZXR0aW5ncyAmJiBzZXR0aW5ncy0+bWVkaWFQbGF5YmFja1JlcXVp cmVzVXNlckdlc3R1cmUoKSkgeworICAgIGlmIChzZXR0aW5ncyAmJiBzZXR0aW5ncy0+cmVxdWly ZXNVc2VyR2VzdHVyZUZvck1lZGlhUGxheWJhY2soKSkgewogICAgICAgICBtX21lZGlhU2Vzc2lv bi0+YWRkQmVoYXZpb3JSZXN0cmljdGlvbihIVE1MTWVkaWFTZXNzaW9uOjpSZXF1aXJlVXNlckdl c3R1cmVGb3JSYXRlQ2hhbmdlKTsKICAgICAgICAgbV9tZWRpYVNlc3Npb24tPmFkZEJlaGF2aW9y UmVzdHJpY3Rpb24oSFRNTE1lZGlhU2Vzc2lvbjo6UmVxdWlyZVVzZXJHZXN0dXJlRm9yTG9hZCk7 CiAgICAgfQogI2Vsc2UKICAgICBtX3NlbmRQcm9ncmVzc0V2ZW50cyA9IGZhbHNlOwotICAgIGlm ICghc2V0dGluZ3MgfHwgc2V0dGluZ3MtPm1lZGlhUGxheWJhY2tSZXF1aXJlc1VzZXJHZXN0dXJl KCkpIHsKKyAgICBpZiAoIXNldHRpbmdzIHx8IHNldHRpbmdzLT5yZXF1aXJlc1VzZXJHZXN0dXJl Rm9yTWVkaWFQbGF5YmFjaygpKSB7CiAgICAgICAgIC8vIEFsbG93IGF1dG9wbGF5IGluIGEgTWVk aWFEb2N1bWVudCB0aGF0IGlzIG5vdCBpbiBhbiBpZnJhbWUuCiAgICAgICAgIGlmIChkb2N1bWVu dC5vd25lckVsZW1lbnQoKSB8fCAhZG9jdW1lbnQuaXNNZWRpYURvY3VtZW50KCkpCiAgICAgICAg ICAgICBtX21lZGlhU2Vzc2lvbi0+YWRkQmVoYXZpb3JSZXN0cmljdGlvbihIVE1MTWVkaWFTZXNz aW9uOjpSZXF1aXJlVXNlckdlc3R1cmVGb3JSYXRlQ2hhbmdlKTsKQEAgLTM4Myw3ICszODMsNyBA QCBIVE1MTWVkaWFFbGVtZW50OjpIVE1MTWVkaWFFbGVtZW50KGNvbnN0IFF1YWxpZmllZE5hbWUm IHRhZ05hbWUsIERvY3VtZW50JiBkb2N1bQogICAgICAgICBtX21lZGlhU2Vzc2lvbi0+YWRkQmVo YXZpb3JSZXN0cmljdGlvbihIVE1MTWVkaWFTZXNzaW9uOjpSZXF1aXJlVXNlckdlc3R1cmVUb1No b3dQbGF5YmFja1RhcmdldFBpY2tlcik7CiAjZW5kaWYKICAgICB9IGVsc2UgewotICAgICAgICAv LyBSZWxheCBSZXF1aXJlVXNlckdlc3R1cmVGb3JGdWxsc2NyZWVuIHdoZW4gbWVkaWFQbGF5YmFj a1JlcXVpcmVzVXNlckdlc3R1cmUgaXMgbm90IHNldDoKKyAgICAgICAgLy8gUmVsYXggUmVxdWly ZVVzZXJHZXN0dXJlRm9yRnVsbHNjcmVlbiB3aGVuIHJlcXVpcmVzVXNlckdlc3R1cmVGb3JNZWRp YVBsYXliYWNrIGlzIG5vdCBzZXQ6CiAgICAgICAgIG1fbWVkaWFTZXNzaW9uLT5yZW1vdmVCZWhh dmlvclJlc3RyaWN0aW9uKEhUTUxNZWRpYVNlc3Npb246OlJlcXVpcmVVc2VyR2VzdHVyZUZvckZ1 bGxzY3JlZW4pOwogICAgIH0KICNlbmRpZiAvLyAhUExBVEZPUk0oSU9TKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1Nl dHRpbmdzLmNwcAppbmRleCA3MzhjOGFjZGU4OTQwNmU4ZDAyMDA5MjIxZDU5MWNlMjkxZmQ5MTkz Li44MmQyNzkwMmRhZDllZTMxM2EzM2M0ZTcxNzc5OGRjNzg2Njk2NzYzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L1NldHRpbmdzLmNwcApAQCAtMTI2LDcgKzEyNiw3IEBAIHN0YXRpYyBjb25zdCBib29sIGRlZmF1 bHRGaXhlZFBvc2l0aW9uQ3JlYXRlc1N0YWNraW5nQ29udGV4dCA9IHRydWU7CiBzdGF0aWMgY29u c3QgYm9vbCBkZWZhdWx0Rml4ZWRCYWNrZ3JvdW5kc1BhaW50UmVsYXRpdmVUb0RvY3VtZW50ID0g dHJ1ZTsKIHN0YXRpYyBjb25zdCBib29sIGRlZmF1bHRBY2NlbGVyYXRlZENvbXBvc2l0aW5nRm9y Rml4ZWRQb3NpdGlvbkVuYWJsZWQgPSB0cnVlOwogc3RhdGljIGNvbnN0IGJvb2wgZGVmYXVsdE1l ZGlhUGxheWJhY2tBbGxvd3NJbmxpbmUgPSBmYWxzZTsKLXN0YXRpYyBjb25zdCBib29sIGRlZmF1 bHRNZWRpYVBsYXliYWNrUmVxdWlyZXNVc2VyR2VzdHVyZSA9IHRydWU7CitzdGF0aWMgY29uc3Qg Ym9vbCBkZWZhdWx0UmVxdWlyZXNVc2VyR2VzdHVyZUZvck1lZGlhUGxheWJhY2sgPSB0cnVlOwog c3RhdGljIGNvbnN0IGJvb2wgZGVmYXVsdEF1ZGlvUGxheWJhY2tSZXF1aXJlc1VzZXJHZXN0dXJl ID0gdHJ1ZTsKIHN0YXRpYyBjb25zdCBib29sIGRlZmF1bHRTaG91bGRSZXNwZWN0SW1hZ2VPcmll bnRhdGlvbiA9IHRydWU7CiBzdGF0aWMgY29uc3QgYm9vbCBkZWZhdWx0SW1hZ2VTdWJzYW1wbGlu Z0VuYWJsZWQgPSB0cnVlOwpAQCAtMTM2LDcgKzEzNiw3IEBAIHN0YXRpYyBjb25zdCBib29sIGRl ZmF1bHRGaXhlZFBvc2l0aW9uQ3JlYXRlc1N0YWNraW5nQ29udGV4dCA9IGZhbHNlOwogc3RhdGlj IGNvbnN0IGJvb2wgZGVmYXVsdEZpeGVkQmFja2dyb3VuZHNQYWludFJlbGF0aXZlVG9Eb2N1bWVu dCA9IGZhbHNlOwogc3RhdGljIGNvbnN0IGJvb2wgZGVmYXVsdEFjY2VsZXJhdGVkQ29tcG9zaXRp bmdGb3JGaXhlZFBvc2l0aW9uRW5hYmxlZCA9IGZhbHNlOwogc3RhdGljIGNvbnN0IGJvb2wgZGVm YXVsdE1lZGlhUGxheWJhY2tBbGxvd3NJbmxpbmUgPSB0cnVlOwotc3RhdGljIGNvbnN0IGJvb2wg ZGVmYXVsdE1lZGlhUGxheWJhY2tSZXF1aXJlc1VzZXJHZXN0dXJlID0gZmFsc2U7CitzdGF0aWMg Y29uc3QgYm9vbCBkZWZhdWx0UmVxdWlyZXNVc2VyR2VzdHVyZUZvck1lZGlhUGxheWJhY2sgPSBm YWxzZTsKIHN0YXRpYyBjb25zdCBib29sIGRlZmF1bHRBdWRpb1BsYXliYWNrUmVxdWlyZXNVc2Vy R2VzdHVyZSA9IGZhbHNlOwogc3RhdGljIGNvbnN0IGJvb2wgZGVmYXVsdFNob3VsZFJlc3BlY3RJ bWFnZU9yaWVudGF0aW9uID0gZmFsc2U7CiBzdGF0aWMgY29uc3QgYm9vbCBkZWZhdWx0SW1hZ2VT dWJzYW1wbGluZ0VuYWJsZWQgPSBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvU2V0dGluZ3MuaW4gYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmluCmluZGV4IDNk OThjMjliMTM0YTI5NWRhYmZmY2E5ZGQzMDE1NjE4MWJhN2RhOWUuLjM0Mjk3ODIzMWNkNGU4ODM0 ZjljMzJlMTgzODJlNzFmOTI1NGE3ZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv U2V0dGluZ3MuaW4KKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5pbgpAQCAtMTI1 LDcgKzEyNSw3IEBAIHNob3VsZEluamVjdFVzZXJTY3JpcHRzSW5Jbml0aWFsRW1wdHlEb2N1bWVu dCBpbml0aWFsPWZhbHNlCiBmaXhlZEVsZW1lbnRzTGF5b3V0UmVsYXRpdmVUb0ZyYW1lIGluaXRp YWw9ZmFsc2UKIGFsbG93RGlzcGxheU9mSW5zZWN1cmVDb250ZW50IGluaXRpYWw9ZmFsc2UKIGFs bG93UnVubmluZ09mSW5zZWN1cmVDb250ZW50IGluaXRpYWw9ZmFsc2UKLW1lZGlhUGxheWJhY2tS ZXF1aXJlc1VzZXJHZXN0dXJlIGluaXRpYWw9ZGVmYXVsdE1lZGlhUGxheWJhY2tSZXF1aXJlc1Vz ZXJHZXN0dXJlCityZXF1aXJlc1VzZXJHZXN0dXJlRm9yTWVkaWFQbGF5YmFjayBpbml0aWFsPWRl ZmF1bHRSZXF1aXJlc1VzZXJHZXN0dXJlRm9yTWVkaWFQbGF5YmFjawogYXVkaW9QbGF5YmFja1Jl cXVpcmVzVXNlckdlc3R1cmUgaW5pdGlhbD1kZWZhdWx0QXVkaW9QbGF5YmFja1JlcXVpcmVzVXNl ckdlc3R1cmUKIG1lZGlhUGxheWJhY2tBbGxvd3NJbmxpbmUgaW5pdGlhbD1kZWZhdWx0TWVkaWFQ bGF5YmFja0FsbG93c0lubGluZQogYWxsb3dzQWx0ZXJuYXRlRnVsbHNjcmVlbiBpbml0aWFsPWRl ZmF1bHRBbGxvd3NBbHRlcm5hdGVGdWxsc2NyZWVuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VLZXlzUHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdC9t YWMvV2ViVmlldy9XZWJQcmVmZXJlbmNlS2V5c1ByaXZhdGUuaAppbmRleCBhZWE5MGQ0MWQ5YzMy ZGFiNDU4OWZkNGQ4N2U1ZDQ4NzJjMjk4MTE0Li40ZjUxZTA1NTYzMWQ3M2RmZWFkOWNlNTU4ZWE0 NjEwMGVkZGNjMzc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlBy ZWZlcmVuY2VLZXlzUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2Vi UHJlZmVyZW5jZUtleXNQcml2YXRlLmgKQEAgLTExOSw3ICsxMTksNyBAQAogI2RlZmluZSBXZWJL aXRIeXBlcmxpbmtBdWRpdGluZ0VuYWJsZWRQcmVmZXJlbmNlS2V5IEAiV2ViS2l0SHlwZXJsaW5r QXVkaXRpbmdFbmFibGVkIgogI2RlZmluZSBXZWJLaXRBVkZvdW5kYXRpb25FbmFibGVkS2V5IEAi V2ViS2l0QVZGb3VuZGF0aW9uRW5hYmxlZCIKICNkZWZpbmUgV2ViS2l0SGl4aWU3NldlYlNvY2tl dFByb3RvY29sRW5hYmxlZEtleSBAIldlYktpdEhpeGllNzZXZWJTb2NrZXRQcm90b2NvbEVuYWJs ZWQiCi0jZGVmaW5lIFdlYktpdE1lZGlhUGxheWJhY2tSZXF1aXJlc1VzZXJHZXN0dXJlUHJlZmVy ZW5jZUtleSBAIldlYktpdE1lZGlhUGxheWJhY2tSZXF1aXJlc1VzZXJHZXN0dXJlIgorI2RlZmlu ZSBXZWJLaXRSZXF1aXJlc1VzZXJHZXN0dXJlRm9yTWVkaWFQbGF5YmFja1ByZWZlcmVuY2VLZXkg QCJXZWJLaXRNZWRpYVBsYXliYWNrUmVxdWlyZXNVc2VyR2VzdHVyZSIKICNkZWZpbmUgV2ViS2l0 TWVkaWFQbGF5YmFja0FsbG93c0lubGluZVByZWZlcmVuY2VLZXkgQCJXZWJLaXRNZWRpYVBsYXli YWNrQWxsb3dzSW5saW5lIgogI2RlZmluZSBXZWJLaXRBbGxvd3NBbHRlcm5hdGVGdWxsc2NyZWVu UHJlZmVyZW5jZUtleSBAIldlYktpdEFsbG93c0FsdGVybmF0ZUZ1bGxzY3JlZW4iCiAjZGVmaW5l IFdlYktpdE1vY2tTY3JvbGxiYXJzRW5hYmxlZFByZWZlcmVuY2VLZXkgQCJXZWJLaXRNb2NrU2Ny b2xsYmFyc0VuYWJsZWQiCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dl YlByZWZlcmVuY2VzLm1tIGIvU291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJQcmVmZXJlbmNl cy5tbQppbmRleCBhMjE0YzY2NDk4YjY1NDU3MTgzZTc4NzE3MzkwOWM3YzRmOTBiNzcyLi4xYmEw MTJmYTQ1OTc5ZWYxYWQ0MDcyZTQ4YWY3ZGJkZDllY2Y1MThhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L21hYy9XZWJWaWV3L1dlYlByZWZlcmVuY2VzLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQv bWFjL1dlYlZpZXcvV2ViUHJlZmVyZW5jZXMubW0KQEAgLTUxNyw3ICs1MTcsNyBAQCArICh2b2lk KWluaXRpYWxpemUKICAgICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhCb29sOllFU10sICBXZWJL aXRBVkZvdW5kYXRpb25FbmFibGVkS2V5LAogICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJv b2w6Tk9dLCAgIFdlYktpdFN1cHByZXNzZXNJbmNyZW1lbnRhbFJlbmRlcmluZ0tleSwKICNpZiAh UExBVEZPUk0oSU9TKQotICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6Tk9dLCAgIFdl YktpdE1lZGlhUGxheWJhY2tSZXF1aXJlc1VzZXJHZXN0dXJlUHJlZmVyZW5jZUtleSwKKyAgICAg ICAgW05TTnVtYmVyIG51bWJlcldpdGhCb29sOk5PXSwgICBXZWJLaXRSZXF1aXJlc1VzZXJHZXN0 dXJlRm9yTWVkaWFQbGF5YmFja1ByZWZlcmVuY2VLZXksCiAgICAgICAgIFtOU051bWJlciBudW1i ZXJXaXRoQm9vbDpZRVNdLCAgV2ViS2l0TWVkaWFQbGF5YmFja0FsbG93c0lubGluZVByZWZlcmVu Y2VLZXksCiAgICAgICAgIFtOU051bWJlciBudW1iZXJXaXRoQm9vbDpOT10sICAgV2ViS2l0V2Vi QXVkaW9FbmFibGVkUHJlZmVyZW5jZUtleSwKICAgICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhC b29sOllFU10sICBXZWJLaXRCYWNrc3BhY2VLZXlOYXZpZ2F0aW9uRW5hYmxlZEtleSwKQEAgLTUy Nyw3ICs1MjcsNyBAQCArICh2b2lkKWluaXRpYWxpemUKICAgICAgICAgW05TTnVtYmVyIG51bWJl cldpdGhCb29sOllFU10sICBXZWJLaXROb3RpZmljYXRpb25zRW5hYmxlZEtleSwKICAgICAgICAg W05TTnVtYmVyIG51bWJlcldpdGhCb29sOk5PXSwgICBXZWJLaXRTaG91bGRSZXNwZWN0SW1hZ2VP cmllbnRhdGlvbktleSwKICNlbHNlCi0gICAgICAgIFtOU051bWJlciBudW1iZXJXaXRoQm9vbDpZ RVNdLCAgV2ViS2l0TWVkaWFQbGF5YmFja1JlcXVpcmVzVXNlckdlc3R1cmVQcmVmZXJlbmNlS2V5 LAorICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6WUVTXSwgIFdlYktpdFJlcXVpcmVz VXNlckdlc3R1cmVGb3JNZWRpYVBsYXliYWNrUHJlZmVyZW5jZUtleSwKICAgICAgICAgW05TTnVt YmVyIG51bWJlcldpdGhCb29sOk5PXSwgICBXZWJLaXRNZWRpYVBsYXliYWNrQWxsb3dzSW5saW5l UHJlZmVyZW5jZUtleSwKICAgICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhCb29sOllFU10sICBX ZWJLaXRNZWRpYVBsYXliYWNrQWxsb3dzQWlyUGxheVByZWZlcmVuY2VLZXksCiAgICAgICAgIFtO U051bWJlciBudW1iZXJXaXRoVW5zaWduZWRJbnQ6QXVkaW9TZXNzaW9uOjpOb25lXSwgIFdlYktp dEF1ZGlvU2Vzc2lvbkNhdGVnb3J5T3ZlcnJpZGUsCkBAIC0yMTYwLDEyICsyMTYwLDEyIEBAIC0g KHZvaWQpc2V0TmV0d29ya0ludGVyZmFjZU5hbWU6KE5TU3RyaW5nICopbmFtZQogCiAtIChCT09M KW1lZGlhUGxheWJhY2tSZXF1aXJlc1VzZXJHZXN0dXJlCiB7Ci0gICAgcmV0dXJuIFtzZWxmIF9i b29sVmFsdWVGb3JLZXk6V2ViS2l0TWVkaWFQbGF5YmFja1JlcXVpcmVzVXNlckdlc3R1cmVQcmVm ZXJlbmNlS2V5XTsKKyAgICByZXR1cm4gW3NlbGYgX2Jvb2xWYWx1ZUZvcktleTpXZWJLaXRSZXF1 aXJlc1VzZXJHZXN0dXJlRm9yTWVkaWFQbGF5YmFja1ByZWZlcmVuY2VLZXldOwogfQogCiAtICh2 b2lkKXNldE1lZGlhUGxheWJhY2tSZXF1aXJlc1VzZXJHZXN0dXJlOihCT09MKWZsYWcKIHsKLSAg ICBbc2VsZiBfc2V0Qm9vbFZhbHVlOmZsYWcgZm9yS2V5OldlYktpdE1lZGlhUGxheWJhY2tSZXF1 aXJlc1VzZXJHZXN0dXJlUHJlZmVyZW5jZUtleV07CisgICAgW3NlbGYgX3NldEJvb2xWYWx1ZTpm bGFnIGZvcktleTpXZWJLaXRSZXF1aXJlc1VzZXJHZXN0dXJlRm9yTWVkaWFQbGF5YmFja1ByZWZl cmVuY2VLZXldOwogfQogCiAtIChCT09MKW1lZGlhUGxheWJhY2tBbGxvd3NJbmxpbmUKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJL aXQvbWFjL1dlYlZpZXcvV2ViVmlldy5tbQppbmRleCAyOTdlMjkwZDJjMmYxNzliZjcwMzhhY2Qy NTI4YTNiODU4YjhjMTIyLi4yODBkMDc1ZTMxNWVhOTQ4YTdkMGJjYjE0MjJiYWFlNmNhZjRjZTcx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZXcubW0KKysrIGIv U291cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3Lm1tCkBAIC0yMjk2LDcgKzIyOTYsNyBA QCAtICh2b2lkKV9wcmVmZXJlbmNlc0NoYW5nZWQ6KFdlYlByZWZlcmVuY2VzICopcHJlZmVyZW5j ZXMKICAgICBzZXR0aW5ncy5zZXRJbnRlcmFjdGl2ZUZvcm1WYWxpZGF0aW9uRW5hYmxlZChbc2Vs ZiBpbnRlcmFjdGl2ZUZvcm1WYWxpZGF0aW9uRW5hYmxlZF0pOwogICAgIHNldHRpbmdzLnNldFZh bGlkYXRpb25NZXNzYWdlVGltZXJNYWduaWZpY2F0aW9uKFtzZWxmIHZhbGlkYXRpb25NZXNzYWdl VGltZXJNYWduaWZpY2F0aW9uXSk7CiAKLSAgICBzZXR0aW5ncy5zZXRNZWRpYVBsYXliYWNrUmVx dWlyZXNVc2VyR2VzdHVyZShbcHJlZmVyZW5jZXMgbWVkaWFQbGF5YmFja1JlcXVpcmVzVXNlckdl c3R1cmVdKTsKKyAgICBzZXR0aW5ncy5zZXRSZXF1aXJlc1VzZXJHZXN0dXJlRm9yTWVkaWFQbGF5 YmFjayhbcHJlZmVyZW5jZXMgbWVkaWFQbGF5YmFja1JlcXVpcmVzVXNlckdlc3R1cmVdKTsKICAg ICBzZXR0aW5ncy5zZXRNZWRpYVBsYXliYWNrQWxsb3dzSW5saW5lKFtwcmVmZXJlbmNlcyBtZWRp YVBsYXliYWNrQWxsb3dzSW5saW5lXSk7CiAgICAgc2V0dGluZ3Muc2V0QWxsb3dzQWx0ZXJuYXRl RnVsbHNjcmVlbihbcHJlZmVyZW5jZXMgYWxsb3dzQWx0ZXJuYXRlRnVsbHNjcmVlbl0gJiYgc2hv dWxkQWxsb3dBbHRlcm5hdGVGdWxsc2NyZWVuKCkpOwogICAgIHNldHRpbmdzLnNldFN1cHByZXNz ZXNJbmNyZW1lbnRhbFJlbmRlcmluZyhbcHJlZmVyZW5jZXMgc3VwcHJlc3Nlc0luY3JlbWVudGFs UmVuZGVyaW5nXSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVy ZW5jZXNEZWZpbml0aW9ucy5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByZWZlcmVuY2Vz RGVmaW5pdGlvbnMuaAppbmRleCAxZGRjN2QyNjZkYmJkZDRjZGM3ZTI0MzkzYmVlMWU2MmRjN2I0 MDdkLi40MTI2MTI2NzFkNTA3NWY1NDkzNTExNzAzZWM1MzEyMzZmODMzMWNjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJlZmVyZW5jZXNEZWZpbml0aW9ucy5oCisrKyBi L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9XZWJQcmVmZXJlbmNlc0RlZmluaXRpb25zLmgKQEAgLTU3 LDcgKzU3LDcgQEAKICNkZWZpbmUgREVGQVVMVF9NSU5JTVVNX0ZPTlRfWk9PTV9TSVpFIFdLR2V0 TWluaW11bVpvb21Gb250U2l6ZSgpCiAjZGVmaW5lIERFRkFVTFRfUEFTU1dPUkRfRUNIT19FTkFC TEVEIHRydWUKICNkZWZpbmUgREVGQVVMVF9NRURJQV9QTEFZQkFDS19BTExPV1NfSU5MSU5FIGZh bHNlCi0jZGVmaW5lIERFRkFVTFRfTUVESUFfUExBWUJBQ0tfUkVRVUlSRVNfVVNFUl9HRVNUVVJF IHRydWUKKyNkZWZpbmUgREVGQVVMVF9SRVFVSVJFU19VU0VSX0dFU1RVUkVfRk9SX01FRElBX1BM QVlCQUNLIHRydWUKICNkZWZpbmUgREVGQVVMVF9URU1QT1JBUllfVElMRV9DT0hPUlRfUkVURU5U SU9OX0VOQUJMRUQgZmFsc2UKICNlbHNlCiAjZGVmaW5lIERFRkFVTFRfRlJBTUVfRkxBVFRFTklO R19FTkFCTEVEIGZhbHNlCkBAIC02OCw3ICs2OCw3IEBACiAjZGVmaW5lIERFRkFVTFRfTUlOSU1V TV9GT05UX1pPT01fU0laRSAwCiAjZGVmaW5lIERFRkFVTFRfUEFTU1dPUkRfRUNIT19FTkFCTEVE IGZhbHNlCiAjZGVmaW5lIERFRkFVTFRfTUVESUFfUExBWUJBQ0tfQUxMT1dTX0lOTElORSB0cnVl Ci0jZGVmaW5lIERFRkFVTFRfTUVESUFfUExBWUJBQ0tfUkVRVUlSRVNfVVNFUl9HRVNUVVJFIGZh bHNlCisjZGVmaW5lIERFRkFVTFRfUkVRVUlSRVNfVVNFUl9HRVNUVVJFX0ZPUl9NRURJQV9QTEFZ QkFDSyBmYWxzZQogI2RlZmluZSBERUZBVUxUX1RFTVBPUkFSWV9USUxFX0NPSE9SVF9SRVRFTlRJ T05fRU5BQkxFRCB0cnVlCiAjZW5kaWYKIApAQCAtMTI4LDcgKzEyOCw3IEBACiAgICAgbWFjcm8o QWxsb3dVbml2ZXJzYWxBY2Nlc3NGcm9tRmlsZVVSTHMsIGFsbG93VW5pdmVyc2FsQWNjZXNzRnJv bUZpbGVVUkxzLCBCb29sLCBib29sLCBmYWxzZSkgXAogICAgIG1hY3JvKEFsbG93RmlsZUFjY2Vz c0Zyb21GaWxlVVJMcywgYWxsb3dGaWxlQWNjZXNzRnJvbUZpbGVVUkxzLCBCb29sLCBib29sLCBm YWxzZSkgXAogICAgIG1hY3JvKEFWRm91bmRhdGlvbkVuYWJsZWQsIGlzQVZGb3VuZGF0aW9uRW5h YmxlZCwgQm9vbCwgYm9vbCwgdHJ1ZSkgXAotICAgIG1hY3JvKE1lZGlhUGxheWJhY2tSZXF1aXJl c1VzZXJHZXN0dXJlLCBtZWRpYVBsYXliYWNrUmVxdWlyZXNVc2VyR2VzdHVyZSwgQm9vbCwgYm9v bCwgREVGQVVMVF9NRURJQV9QTEFZQkFDS19SRVFVSVJFU19VU0VSX0dFU1RVUkUpIFwKKyAgICBt YWNybyhSZXF1aXJlc1VzZXJHZXN0dXJlRm9yTWVkaWFQbGF5YmFjaywgcmVxdWlyZXNVc2VyR2Vz dHVyZUZvck1lZGlhUGxheWJhY2ssIEJvb2wsIGJvb2wsIERFRkFVTFRfUkVRVUlSRVNfVVNFUl9H RVNUVVJFX0ZPUl9NRURJQV9QTEFZQkFDSykgXAogICAgIG1hY3JvKE1lZGlhUGxheWJhY2tBbGxv d3NJbmxpbmUsIG1lZGlhUGxheWJhY2tBbGxvd3NJbmxpbmUsIEJvb2wsIGJvb2wsIERFRkFVTFRf TUVESUFfUExBWUJBQ0tfQUxMT1dTX0lOTElORSkgXAogICAgIG1hY3JvKEFsbG93c0FsdGVybmF0 ZUZ1bGxzY3JlZW4sIGFsbG93c0FsdGVybmF0ZUZ1bGxzY3JlZW4sIEJvb2wsIGJvb2wsIHRydWUp IFwKICAgICBtYWNybyhNZWRpYVBsYXliYWNrQWxsb3dzQWlyUGxheSwgbWVkaWFQbGF5YmFja0Fs bG93c0FpclBsYXksIEJvb2wsIGJvb2wsIHRydWUpIFwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQy9XS1ByZWZlcmVuY2VzLmNwcAppbmRleCBlNzhiNzRmYzJkOGFmZjUzMTNl ZjA1ZmVjMTYyMjYwODhiNzk0N2M0Li5iMTYzMDVjYjVmYmI1MDBlMzZlYzllMWVlODc5MmJmYjVj YzI1MWI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQcmVm ZXJlbmNlcy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUHJlZmVy ZW5jZXMuY3BwCkBAIC03MzAsMTIgKzczMCwxMiBAQCBib29sIFdLUHJlZmVyZW5jZXNHZXRIaXhp ZTc2V2ViU29ja2V0UHJvdG9jb2xFbmFibGVkKFdLUHJlZmVyZW5jZXNSZWYpCiAKIHZvaWQgV0tQ cmVmZXJlbmNlc1NldE1lZGlhUGxheWJhY2tSZXF1aXJlc1VzZXJHZXN0dXJlKFdLUHJlZmVyZW5j ZXNSZWYgcHJlZmVyZW5jZXNSZWYsIGJvb2wgZmxhZykKIHsKLSAgICB0b0ltcGwocHJlZmVyZW5j ZXNSZWYpLT5zZXRNZWRpYVBsYXliYWNrUmVxdWlyZXNVc2VyR2VzdHVyZShmbGFnKTsKKyAgICB0 b0ltcGwocHJlZmVyZW5jZXNSZWYpLT5zZXRSZXF1aXJlc1VzZXJHZXN0dXJlRm9yTWVkaWFQbGF5 YmFjayhmbGFnKTsKIH0KIAogYm9vbCBXS1ByZWZlcmVuY2VzR2V0TWVkaWFQbGF5YmFja1JlcXVp cmVzVXNlckdlc3R1cmUoV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZikKIHsKLSAgICBy ZXR1cm4gdG9JbXBsKHByZWZlcmVuY2VzUmVmKS0+bWVkaWFQbGF5YmFja1JlcXVpcmVzVXNlckdl c3R1cmUoKTsKKyAgICByZXR1cm4gdG9JbXBsKHByZWZlcmVuY2VzUmVmKS0+cmVxdWlyZXNVc2Vy R2VzdHVyZUZvck1lZGlhUGxheWJhY2soKTsKIH0KIAogdm9pZCBXS1ByZWZlcmVuY2VzU2V0TWVk aWFQbGF5YmFja0FsbG93c0lubGluZShXS1ByZWZlcmVuY2VzUmVmIHByZWZlcmVuY2VzUmVmLCBi b29sIGZsYWcpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29h L1dLV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJW aWV3Lm1tCmluZGV4IGIwYWRlNTcwZWJkZmJjNzEyZTdiMzAyZjgxYzU4YmFkMDEwNDQ2YmQuLmZm ODU3NzAwODE4YWJlNGM1MTJiMzU5MDljYjJkYzE0ZDIyZGZmNmIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCkBAIC0zMjAsNyArMzIwLDcg QEAgLSAoaW5zdGFuY2V0eXBlKWluaXRXaXRoRnJhbWU6KENHUmVjdClmcmFtZSBjb25maWd1cmF0 aW9uOihXS1dlYlZpZXdDb25maWd1cmF0aW8KICNpZiBQTEFURk9STShJT1MpCiAgICAgd2ViUGFn ZUNvbmZpZ3VyYXRpb24ucHJlZmVyZW5jZVZhbHVlcy5zZXQoV2ViS2l0OjpXZWJQcmVmZXJlbmNl c0tleTo6bWVkaWFQbGF5YmFja0FsbG93c0lubGluZUtleSgpLCBXZWJLaXQ6OldlYlByZWZlcmVu Y2VzU3RvcmU6OlZhbHVlKCEhW19jb25maWd1cmF0aW9uIGFsbG93c0lubGluZU1lZGlhUGxheWJh Y2tdKSk7CiAgICAgd2ViUGFnZUNvbmZpZ3VyYXRpb24ucHJlZmVyZW5jZVZhbHVlcy5zZXQoV2Vi S2l0OjpXZWJQcmVmZXJlbmNlc0tleTo6YWxsb3dzQWx0ZXJuYXRlRnVsbHNjcmVlbktleSgpLCBX ZWJLaXQ6OldlYlByZWZlcmVuY2VzU3RvcmU6OlZhbHVlKCEhW19jb25maWd1cmF0aW9uIF9hbGxv d3NBbHRlcm5hdGVGdWxsc2NyZWVuXSAmJiBzaG91bGRBbGxvd0FsdGVybmF0ZUZ1bGxzY3JlZW4o KSkpOwotICAgIHdlYlBhZ2VDb25maWd1cmF0aW9uLnByZWZlcmVuY2VWYWx1ZXMuc2V0KFdlYktp dDo6V2ViUHJlZmVyZW5jZXNLZXk6Om1lZGlhUGxheWJhY2tSZXF1aXJlc1VzZXJHZXN0dXJlS2V5 KCksIFdlYktpdDo6V2ViUHJlZmVyZW5jZXNTdG9yZTo6VmFsdWUoISFbX2NvbmZpZ3VyYXRpb24g bWVkaWFQbGF5YmFja1JlcXVpcmVzVXNlckFjdGlvbl0pKTsKKyAgICB3ZWJQYWdlQ29uZmlndXJh dGlvbi5wcmVmZXJlbmNlVmFsdWVzLnNldChXZWJLaXQ6OldlYlByZWZlcmVuY2VzS2V5OjpyZXF1 aXJlc1VzZXJHZXN0dXJlRm9yTWVkaWFQbGF5YmFja0tleSgpLCBXZWJLaXQ6OldlYlByZWZlcmVu Y2VzU3RvcmU6OlZhbHVlKCEhW19jb25maWd1cmF0aW9uIG1lZGlhUGxheWJhY2tSZXF1aXJlc1Vz ZXJBY3Rpb25dKSk7CiAgICAgd2ViUGFnZUNvbmZpZ3VyYXRpb24ucHJlZmVyZW5jZVZhbHVlcy5z ZXQoV2ViS2l0OjpXZWJQcmVmZXJlbmNlc0tleTo6bWVkaWFQbGF5YmFja0FsbG93c0FpclBsYXlL ZXkoKSwgV2ViS2l0OjpXZWJQcmVmZXJlbmNlc1N0b3JlOjpWYWx1ZSghIVtfY29uZmlndXJhdGlv biBtZWRpYVBsYXliYWNrQWxsb3dzQWlyUGxheV0pKTsKICNlbmRpZgogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggZTg0MTcwYmM0ZDg3YTJh ODI1OGRhODVmNzc0NWU2YzRhNjRmZjUzOS4uMzdiYWU1MmNjYmU0MzI2NDRlM2JlNGIyMmZhYWI2 N2M4NWRhMDliOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmNwcApAQCAtMjc2OSw3ICsyNzY5LDcgQEAgdm9pZCBXZWJQYWdlOjp1cGRhdGVQcmVmZXJl bmNlcyhjb25zdCBXZWJQcmVmZXJlbmNlc1N0b3JlJiBzdG9yZSkKICAgICBzZXR0aW5ncy5zZXRX ZWJHTEVuYWJsZWQoc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5Ojp3 ZWJHTEVuYWJsZWRLZXkoKSkpOwogICAgIHNldHRpbmdzLnNldEZvcmNlU29mdHdhcmVXZWJHTFJl bmRlcmluZyhzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNLZXk6OmZvcmNl U29mdHdhcmVXZWJHTFJlbmRlcmluZ0tleSgpKSk7CiAgICAgc2V0dGluZ3Muc2V0QWNjZWxlcmF0 ZWQyZENhbnZhc0VuYWJsZWQoc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2Vz S2V5OjphY2NlbGVyYXRlZDJkQ2FudmFzRW5hYmxlZEtleSgpKSk7Ci0gICAgc2V0dGluZ3Muc2V0 TWVkaWFQbGF5YmFja1JlcXVpcmVzVXNlckdlc3R1cmUoc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5 KFdlYlByZWZlcmVuY2VzS2V5OjptZWRpYVBsYXliYWNrUmVxdWlyZXNVc2VyR2VzdHVyZUtleSgp KSk7CisgICAgc2V0dGluZ3Muc2V0UmVxdWlyZXNVc2VyR2VzdHVyZUZvck1lZGlhUGxheWJhY2so c3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZlcmVuY2VzS2V5OjpyZXF1aXJlc1VzZXJH ZXN0dXJlRm9yTWVkaWFQbGF5YmFja0tleSgpKSk7CiAgICAgc2V0dGluZ3Muc2V0TWVkaWFQbGF5 YmFja0FsbG93c0lubGluZShzdG9yZS5nZXRCb29sVmFsdWVGb3JLZXkoV2ViUHJlZmVyZW5jZXNL ZXk6Om1lZGlhUGxheWJhY2tBbGxvd3NJbmxpbmVLZXkoKSkpOwogICAgIHNldHRpbmdzLnNldEFs bG93c0FsdGVybmF0ZUZ1bGxzY3JlZW4oc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlByZWZl cmVuY2VzS2V5OjphbGxvd3NBbHRlcm5hdGVGdWxsc2NyZWVuS2V5KCkpKTsKICAgICBzZXR0aW5n cy5zZXRNb2NrU2Nyb2xsYmFyc0VuYWJsZWQoc3RvcmUuZ2V0Qm9vbFZhbHVlRm9yS2V5KFdlYlBy ZWZlcmVuY2VzS2V5Ojptb2NrU2Nyb2xsYmFyc0VuYWJsZWRLZXkoKSkpOwo=