125233 2013-12-04 10:58:27 -0800 [EFL][WK2] Buildfix after r160104 2013-12-04 11:13:20 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ossy ossy andersca cdumez commit-queue gyuyoung.kim mitz ossy rakuco oldest_to_newest 956458 0 ossy 2013-12-04 10:58:27 -0800 http://trac.webkit.org/changeset/160104 broke the EFL build as the EWS noticed. Fix is coming. 956463 1 218419 ossy 2013-12-04 11:03:00 -0800 Created attachment 218419 Patch 956467 2 218419 ossy 2013-12-04 11:13:14 -0800 Comment on attachment 218419 Patch Clearing flags on attachment: 218419 Committed r160107: <http://trac.webkit.org/changeset/160107> 956468 3 ossy 2013-12-04 11:13:20 -0800 All reviewed patches have been landed. Closing bug. 218419 2013-12-04 11:03:00 -0800 2013-12-04 11:13:14 -0800 Patch bug-125233-20131204200412.patch text/plain 17463 ossy U3VidmVyc2lvbiBSZXZpc2lvbjogMTYwMTA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZGM3ZGUxMGNiM2FkM2Q5 ZWVjNzAyZTFlYjZhMjQ3ZWNiYzIxYTQ3OS4uNzk3NTNkNTViNDM3N2NlMDExOWNlNzY2MmNmMDhk NmI2ODhlZTA0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEzLTEyLTA0ICBDc2Fi YSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisKKyAgICAgICAgW0VGTF1bV0syXSBC dWlsZGZpeCBhZnRlciByMTYwMTA0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMjUyMzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb29raWVfbWFuYWdlci5jcHA6 CisgICAgICAgIChFd2tDb29raWVNYW5hZ2VyOjpFd2tDb29raWVNYW5hZ2VyKToKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfZmF2aWNvbl9kYXRhYmFzZS5jcHA6CisgICAgICAgIChF d2tGYXZpY29uRGF0YWJhc2U6OkV3a0Zhdmljb25EYXRhYmFzZSk6CisgICAgICAgICogVUlQcm9j ZXNzL2VmbC9Db250ZXh0SGlzdG9yeUNsaWVudEVmbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkNv bnRleHRIaXN0b3J5Q2xpZW50RWZsOjpDb250ZXh0SGlzdG9yeUNsaWVudEVmbCk6CisgICAgICAg ICogVUlQcm9jZXNzL2VmbC9Db250ZXh0TWVudUNsaWVudEVmbC5jcHA6CisgICAgICAgIChDb250 ZXh0TWVudUNsaWVudEVmbDo6Q29udGV4dE1lbnVDbGllbnRFZmwpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9lZmwvRG93bmxvYWRNYW5hZ2VyRWZsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6RG93bmxv YWRNYW5hZ2VyRWZsOjpEb3dubG9hZE1hbmFnZXJFZmwpOgorICAgICAgICAqIFVJUHJvY2Vzcy9l ZmwvRmluZENsaWVudEVmbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OkZpbmRDbGllbnRFZmw6OkZp bmRDbGllbnRFZmwpOgorICAgICAgICAqIFVJUHJvY2Vzcy9lZmwvRm9ybUNsaWVudEVmbC5jcHA6 CisgICAgICAgIChXZWJLaXQ6OkZvcm1DbGllbnRFZmw6OkZvcm1DbGllbnRFZmwpOgorICAgICAg ICAqIFVJUHJvY2Vzcy9lZmwvUGFnZUxvYWRDbGllbnRFZmwuY3BwOgorICAgICAgICAoV2ViS2l0 OjpQYWdlTG9hZENsaWVudEVmbDo6UGFnZUxvYWRDbGllbnRFZmwpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9lZmwvUGFnZVBvbGljeUNsaWVudEVmbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VQ b2xpY3lDbGllbnRFZmw6OlBhZ2VQb2xpY3lDbGllbnRFZmwpOgorICAgICAgICAqIFVJUHJvY2Vz cy9lZmwvUGFnZVVJQ2xpZW50RWZsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGFnZVVJQ2xpZW50 RWZsOjpQYWdlVUlDbGllbnRFZmwpOgorCiAyMDEzLTEyLTAzICBBbmRlcnMgQ2FybHNzb24gIDxh bmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgRGVwcmVjYXRlIGFsbCB1bnZlcnNpb25lZCBj bGllbnQgc3RydWN0cyBpbiBmYXZvciBvZiBoYXZpbmcgZXhwbGljaXQgdmVyc2lvbmVkIHN0cnVj dHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb29r aWVfbWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29v a2llX21hbmFnZXIuY3BwCmluZGV4IDQ2NzRlMjM0MjIxYjg3ZjA3ZjI2MDBmYzIzYjM1MzhkMDdj MDU2ODguLjVmMWQ0MDNhYWQwODliM2I2ODIxMTgxNmIyMTU0NDhmYzc1ZjcxOTYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb29raWVfbWFuYWdlci5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Nvb2tpZV9tYW5h Z2VyLmNwcApAQCAtNDIsMTIgKzQyLDEyIEBAIEV3a0Nvb2tpZU1hbmFnZXI6OkV3a0Nvb2tpZU1h bmFnZXIoV0tDb29raWVNYW5hZ2VyUmVmIGNvb2tpZU1hbmFnZXIpCiB7CiAgICAgQVNTRVJUKG1f Y29va2llTWFuYWdlcik7CiAKLSAgICBXS0Nvb2tpZU1hbmFnZXJDbGllbnQgd2tDb29raWVNYW5h Z2VyQ2xpZW50ID0gewotICAgICAgICBrV0tDb29raWVNYW5hZ2VyQ2xpZW50Q3VycmVudFZlcnNp b24sCi0gICAgICAgIHRoaXMsIC8vIGNsaWVudEluZm8KLSAgICAgICAgY29va2llc0RpZENoYW5n ZQotICAgIH07Ci0gICAgV0tDb29raWVNYW5hZ2VyU2V0Q2xpZW50KG1fY29va2llTWFuYWdlci5n ZXQoKSwgJndrQ29va2llTWFuYWdlckNsaWVudCk7CisgICAgV0tDb29raWVNYW5hZ2VyQ2xpZW50 VjAgd2tDb29raWVNYW5hZ2VyQ2xpZW50OworICAgIG1lbXNldCgmd2tDb29raWVNYW5hZ2VyQ2xp ZW50LCAwLCBzaXplb2Yod2tDb29raWVNYW5hZ2VyQ2xpZW50KSk7CisgICAgd2tDb29raWVNYW5h Z2VyQ2xpZW50LmJhc2UudmVyc2lvbiA9IDA7CisgICAgd2tDb29raWVNYW5hZ2VyQ2xpZW50LmJh c2UuY2xpZW50SW5mbyA9IHRoaXM7CisgICAgd2tDb29raWVNYW5hZ2VyQ2xpZW50LmNvb2tpZXNE aWRDaGFuZ2UgPSBjb29raWVzRGlkQ2hhbmdlOworICAgIFdLQ29va2llTWFuYWdlclNldENsaWVu dChtX2Nvb2tpZU1hbmFnZXIuZ2V0KCksICZ3a0Nvb2tpZU1hbmFnZXJDbGllbnQuYmFzZSk7CiB9 CiAKIEV3a0Nvb2tpZU1hbmFnZXI6On5Fd2tDb29raWVNYW5hZ2VyKCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19mYXZpY29uX2RhdGFiYXNlLmNwcCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19mYXZpY29uX2RhdGFiYXNlLmNw cAppbmRleCA2MzAwYWIzOTAwYWEzMDFmNWI2OGEyOTQ2NThjZDZlMmMwYjA3N2I0Li42ZGFhYmUx NWJhM2ZhZDI4ZGU1MDY2NGJjNTg1ZmJiMTQ4OTQ5MzAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfZmF2aWNvbl9kYXRhYmFzZS5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Zhdmljb25fZGF0YWJhc2UuY3BwCkBA IC00MiwxMiArNDIsMTIgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIEV3a0Zhdmljb25EYXRh YmFzZTo6RXdrRmF2aWNvbkRhdGFiYXNlKFdLSWNvbkRhdGFiYXNlUmVmIGljb25EYXRhYmFzZSkK ICAgICA6IG1faWNvbkRhdGFiYXNlKGljb25EYXRhYmFzZSkKIHsKLSAgICBXS0ljb25EYXRhYmFz ZUNsaWVudCBpY29uRGF0YWJhc2VDbGllbnQ7CisgICAgV0tJY29uRGF0YWJhc2VDbGllbnRWMSBp Y29uRGF0YWJhc2VDbGllbnQ7CiAgICAgbWVtc2V0KCZpY29uRGF0YWJhc2VDbGllbnQsIDAsIHNp emVvZihXS0ljb25EYXRhYmFzZUNsaWVudCkpOwotICAgIGljb25EYXRhYmFzZUNsaWVudC52ZXJz aW9uID0ga1dLSWNvbkRhdGFiYXNlQ2xpZW50Q3VycmVudFZlcnNpb247Ci0gICAgaWNvbkRhdGFi YXNlQ2xpZW50LmNsaWVudEluZm8gPSB0aGlzOworICAgIGljb25EYXRhYmFzZUNsaWVudC5iYXNl LnZlcnNpb24gPSBrV0tJY29uRGF0YWJhc2VDbGllbnRDdXJyZW50VmVyc2lvbjsKKyAgICBpY29u RGF0YWJhc2VDbGllbnQuYmFzZS5jbGllbnRJbmZvID0gdGhpczsKICAgICBpY29uRGF0YWJhc2VD bGllbnQuaWNvbkRhdGFSZWFkeUZvclBhZ2VVUkwgPSBpY29uRGF0YVJlYWR5Rm9yUGFnZVVSTDsK LSAgICBXS0ljb25EYXRhYmFzZVNldEljb25EYXRhYmFzZUNsaWVudChtX2ljb25EYXRhYmFzZS5n ZXQoKSwgJmljb25EYXRhYmFzZUNsaWVudCk7CisgICAgV0tJY29uRGF0YWJhc2VTZXRJY29uRGF0 YWJhc2VDbGllbnQobV9pY29uRGF0YWJhc2UuZ2V0KCksICZpY29uRGF0YWJhc2VDbGllbnQuYmFz ZSk7CiB9CiAKIEV3a0Zhdmljb25EYXRhYmFzZTo6fkV3a0Zhdmljb25EYXRhYmFzZSgpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL0NvbnRleHRIaXN0b3J5Q2xpZW50 RWZsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvQ29udGV4dEhpc3RvcnlDbGll bnRFZmwuY3BwCmluZGV4IDJjYzRiMzAxM2VlZWM4OTg5MjhlM2QwZjFhNWY4NTA5ZTY5ZmY3Mjgu LjE3Zjk4MjUwYThiYmNhMjM1MGJjZThjNjM5NmI2MTBjZjgwNDk2MGYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvQ29udGV4dEhpc3RvcnlDbGllbnRFZmwuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvQ29udGV4dEhpc3RvcnlDbGllbnRFZmwu Y3BwCkBAIC0xMTYsMTEgKzExNiwxMSBAQCBDb250ZXh0SGlzdG9yeUNsaWVudEVmbDo6Q29udGV4 dEhpc3RvcnlDbGllbnRFZmwoV0tDb250ZXh0UmVmIGNvbnRleHQpCiB7CiAgICAgQVNTRVJUKG1f Y29udGV4dCk7CiAKLSAgICBXS0NvbnRleHRIaXN0b3J5Q2xpZW50IHdrSGlzdG9yeUNsaWVudDsK KyAgICBXS0NvbnRleHRIaXN0b3J5Q2xpZW50VjAgd2tIaXN0b3J5Q2xpZW50OwogICAgIG1lbXNl dCgmd2tIaXN0b3J5Q2xpZW50LCAwLCBzaXplb2YoV0tDb250ZXh0SGlzdG9yeUNsaWVudCkpOwog Ci0gICAgd2tIaXN0b3J5Q2xpZW50LnZlcnNpb24gPSBrV0tDb250ZXh0SGlzdG9yeUNsaWVudEN1 cnJlbnRWZXJzaW9uOwotICAgIHdrSGlzdG9yeUNsaWVudC5jbGllbnRJbmZvID0gdGhpczsKKyAg ICB3a0hpc3RvcnlDbGllbnQuYmFzZS52ZXJzaW9uID0gMDsKKyAgICB3a0hpc3RvcnlDbGllbnQu YmFzZS5jbGllbnRJbmZvID0gdGhpczsKIAogICAgIHdrSGlzdG9yeUNsaWVudC5kaWROYXZpZ2F0 ZVdpdGhOYXZpZ2F0aW9uRGF0YSA9IGRpZE5hdmlnYXRlV2l0aE5hdmlnYXRpb25EYXRhOwogICAg IHdrSGlzdG9yeUNsaWVudC5kaWRQZXJmb3JtQ2xpZW50UmVkaXJlY3QgPSBkaWRQZXJmb3JtQ2xp ZW50UmVkaXJlY3Q7CkBAIC0xMjgsNyArMTI4LDcgQEAgQ29udGV4dEhpc3RvcnlDbGllbnRFZmw6 OkNvbnRleHRIaXN0b3J5Q2xpZW50RWZsKFdLQ29udGV4dFJlZiBjb250ZXh0KQogICAgIHdrSGlz dG9yeUNsaWVudC5kaWRVcGRhdGVIaXN0b3J5VGl0bGUgPSBkaWRVcGRhdGVIaXN0b3J5VGl0bGU7 CiAgICAgd2tIaXN0b3J5Q2xpZW50LnBvcHVsYXRlVmlzaXRlZExpbmtzID0gcG9wdWxhdGVWaXNp dGVkTGlua3M7CiAKLSAgICBXS0NvbnRleHRTZXRIaXN0b3J5Q2xpZW50KG1fY29udGV4dC5nZXQo KSwgJndrSGlzdG9yeUNsaWVudCk7CisgICAgV0tDb250ZXh0U2V0SGlzdG9yeUNsaWVudChtX2Nv bnRleHQuZ2V0KCksICZ3a0hpc3RvcnlDbGllbnQuYmFzZSk7CiB9CiAKIENvbnRleHRIaXN0b3J5 Q2xpZW50RWZsOjp+Q29udGV4dEhpc3RvcnlDbGllbnRFZmwoKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL2VmbC9Db250ZXh0TWVudUNsaWVudEVmbC5jcHAgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvZWZsL0NvbnRleHRNZW51Q2xpZW50RWZsLmNwcAppbmRleCAxNmNh MDdkM2U4NjQwODdkNzlkZmQxZmJkMzI1ZWY4Y2I5OWRlZTdlLi4xYmFjMGRlZjMwMmQ4OWM1Yjc1 ZjU3ODJhNGE1Zjc1ZGZkZDViMTk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvZWZsL0NvbnRleHRNZW51Q2xpZW50RWZsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvZWZsL0NvbnRleHRNZW51Q2xpZW50RWZsLmNwcApAQCAtNTgsMTAgKzU4LDEwIEBAIENv bnRleHRNZW51Q2xpZW50RWZsOjpDb250ZXh0TWVudUNsaWVudEVmbChFd2tWaWV3KiB2aWV3KQog ICAgIFdLUGFnZVJlZiBwYWdlUmVmID0gbV92aWV3LT53a1BhZ2UoKTsKICAgICBBU1NFUlQocGFn ZVJlZik7CiAKLSAgICBXS1BhZ2VDb250ZXh0TWVudUNsaWVudCBjb250ZXh0TWVudUNsaWVudDsK KyAgICBXS1BhZ2VDb250ZXh0TWVudUNsaWVudFYzIGNvbnRleHRNZW51Q2xpZW50OwogICAgIG1l bXNldCgmY29udGV4dE1lbnVDbGllbnQsIDAsIHNpemVvZihXS1BhZ2VDb250ZXh0TWVudUNsaWVu dCkpOwotICAgIGNvbnRleHRNZW51Q2xpZW50LnZlcnNpb24gPSBrV0tQYWdlQ29udGV4dE1lbnVD bGllbnRDdXJyZW50VmVyc2lvbjsKLSAgICBjb250ZXh0TWVudUNsaWVudC5jbGllbnRJbmZvID0g dGhpczsKKyAgICBjb250ZXh0TWVudUNsaWVudC5iYXNlLnZlcnNpb24gPSAzOworICAgIGNvbnRl eHRNZW51Q2xpZW50LmJhc2UuY2xpZW50SW5mbyA9IHRoaXM7CiAgICAgY29udGV4dE1lbnVDbGll bnQuZ2V0Q29udGV4dE1lbnVGcm9tUHJvcG9zZWRNZW51X2RlcHJlY2F0ZWRGb3JVc2VXaXRoVjAg PSAwOwogICAgIGNvbnRleHRNZW51Q2xpZW50LmN1c3RvbUNvbnRleHRNZW51SXRlbVNlbGVjdGVk ID0gY3VzdG9tQ29udGV4dE1lbnVJdGVtU2VsZWN0ZWQ7CiAgICAgY29udGV4dE1lbnVDbGllbnQu Y29udGV4dE1lbnVEaXNtaXNzZWQgPSAwOwpAQCAtNjksNiArNjksNiBAQCBDb250ZXh0TWVudUNs aWVudEVmbDo6Q29udGV4dE1lbnVDbGllbnRFZmwoRXdrVmlldyogdmlldykKICAgICBjb250ZXh0 TWVudUNsaWVudC5zaG93Q29udGV4dE1lbnUgPSBzaG93Q29udGV4dE1lbnU7CiAgICAgY29udGV4 dE1lbnVDbGllbnQuaGlkZUNvbnRleHRNZW51ID0gaGlkZUNvbnRleHRNZW51OwogCi0gICAgV0tQ YWdlU2V0UGFnZUNvbnRleHRNZW51Q2xpZW50KHBhZ2VSZWYsICZjb250ZXh0TWVudUNsaWVudCk7 CisgICAgV0tQYWdlU2V0UGFnZUNvbnRleHRNZW51Q2xpZW50KHBhZ2VSZWYsICZjb250ZXh0TWVu dUNsaWVudC5iYXNlKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L2VmbC9Eb3dubG9hZE1hbmFnZXJFZmwuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2Vm bC9Eb3dubG9hZE1hbmFnZXJFZmwuY3BwCmluZGV4IDBhZTE3MmE3MWViMDI1NTVkYTI5Yjg3ODJh YzQ1ZDQxOTNmM2I3ZTAuLjNlZTA1Y2I0Mzk4MTY1Mjk0MDRhMjY5NTY4ZmQ1ZDYzODM3ZDA4MGMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvRG93bmxvYWRNYW5hZ2Vy RWZsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL0Rvd25sb2FkTWFuYWdl ckVmbC5jcHAKQEAgLTEyMCwxMSArMTIwLDExIEBAIHZvaWQgRG93bmxvYWRNYW5hZ2VyRWZsOjpk aWRGaW5pc2goV0tDb250ZXh0UmVmLCBXS0Rvd25sb2FkUmVmIHdrRG93bmxvYWQsIGNvbnN0CiBE b3dubG9hZE1hbmFnZXJFZmw6OkRvd25sb2FkTWFuYWdlckVmbChXS0NvbnRleHRSZWYgY29udGV4 dCkKICAgICA6IG1fY29udGV4dChjb250ZXh0KQogewotICAgIFdLQ29udGV4dERvd25sb2FkQ2xp ZW50IHdrRG93bmxvYWRDbGllbnQ7CisgICAgV0tDb250ZXh0RG93bmxvYWRDbGllbnRWMCB3a0Rv d25sb2FkQ2xpZW50OwogICAgIG1lbXNldCgmd2tEb3dubG9hZENsaWVudCwgMCwgc2l6ZW9mKFdL Q29udGV4dERvd25sb2FkQ2xpZW50KSk7CiAKLSAgICB3a0Rvd25sb2FkQ2xpZW50LnZlcnNpb24g PSBrV0tDb250ZXh0RG93bmxvYWRDbGllbnRDdXJyZW50VmVyc2lvbjsKLSAgICB3a0Rvd25sb2Fk Q2xpZW50LmNsaWVudEluZm8gPSB0aGlzOworICAgIHdrRG93bmxvYWRDbGllbnQuYmFzZS52ZXJz aW9uID0gMDsKKyAgICB3a0Rvd25sb2FkQ2xpZW50LmJhc2UuY2xpZW50SW5mbyA9IHRoaXM7CiAg ICAgd2tEb3dubG9hZENsaWVudC5kaWRDYW5jZWwgPSBkaWRDYW5jZWw7CiAgICAgd2tEb3dubG9h ZENsaWVudC5kZWNpZGVEZXN0aW5hdGlvbldpdGhTdWdnZXN0ZWRGaWxlbmFtZSA9IGRlY2lkZURl c3RpbmF0aW9uV2l0aFN1Z2dlc3RlZEZpbGVuYW1lOwogICAgIHdrRG93bmxvYWRDbGllbnQuZGlk Q3JlYXRlRGVzdGluYXRpb24gPSBkaWRDcmVhdGVEZXN0aW5hdGlvbjsKQEAgLTEzMyw3ICsxMzMs NyBAQCBEb3dubG9hZE1hbmFnZXJFZmw6OkRvd25sb2FkTWFuYWdlckVmbChXS0NvbnRleHRSZWYg Y29udGV4dCkKICAgICB3a0Rvd25sb2FkQ2xpZW50LmRpZEZhaWwgPSBkaWRGYWlsOwogICAgIHdr RG93bmxvYWRDbGllbnQuZGlkRmluaXNoID0gZGlkRmluaXNoOwogCi0gICAgV0tDb250ZXh0U2V0 RG93bmxvYWRDbGllbnQobV9jb250ZXh0LmdldCgpLCAmd2tEb3dubG9hZENsaWVudCk7CisgICAg V0tDb250ZXh0U2V0RG93bmxvYWRDbGllbnQobV9jb250ZXh0LmdldCgpLCAmd2tEb3dubG9hZENs aWVudC5iYXNlKTsKIH0KIAogRG93bmxvYWRNYW5hZ2VyRWZsOjp+RG93bmxvYWRNYW5hZ2VyRWZs KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvRmluZENsaWVudEVm bC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL0ZpbmRDbGllbnRFZmwuY3BwCmlu ZGV4IDMzNGI0YjViZDJkMWEwMTI2Njg0MmY3YWI4M2NmZjkzOTZkYjY1MmQuLmIwYzU2YWE1YzAx NDNjZGZlNWIyNzJiM2QwNDUzOGJmYWNiODRjODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9lZmwvRmluZENsaWVudEVmbC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL2VmbC9GaW5kQ2xpZW50RWZsLmNwcApAQCAtNTgsMTQgKzU4LDE0IEBAIEZpbmRDbGll bnRFZmw6OkZpbmRDbGllbnRFZmwoRXdrVmlldyogdmlld0ltcGwpCiAgICAgV0tQYWdlUmVmIHBh Z2VSZWYgPSBtX3ZpZXctPndrUGFnZSgpOwogICAgIEFTU0VSVChwYWdlUmVmKTsKIAotICAgIFdL UGFnZUZpbmRDbGllbnQgZmluZENsaWVudDsKKyAgICBXS1BhZ2VGaW5kQ2xpZW50VjAgZmluZENs aWVudDsKICAgICBtZW1zZXQoJmZpbmRDbGllbnQsIDAsIHNpemVvZihXS1BhZ2VGaW5kQ2xpZW50 KSk7Ci0gICAgZmluZENsaWVudC52ZXJzaW9uID0ga1dLUGFnZUZpbmRDbGllbnRDdXJyZW50VmVy c2lvbjsKLSAgICBmaW5kQ2xpZW50LmNsaWVudEluZm8gPSB0aGlzOworICAgIGZpbmRDbGllbnQu YmFzZS52ZXJzaW9uID0gMDsKKyAgICBmaW5kQ2xpZW50LmJhc2UuY2xpZW50SW5mbyA9IHRoaXM7 CiAgICAgZmluZENsaWVudC5kaWRGaW5kU3RyaW5nID0gZGlkRmluZFN0cmluZzsKICAgICBmaW5k Q2xpZW50LmRpZEZhaWxUb0ZpbmRTdHJpbmcgPSBkaWRGYWlsVG9GaW5kU3RyaW5nOwogICAgIGZp bmRDbGllbnQuZGlkQ291bnRTdHJpbmdNYXRjaGVzID0gZGlkRmluZFN0cmluZzsKLSAgICBXS1Bh Z2VTZXRQYWdlRmluZENsaWVudChwYWdlUmVmLCAmZmluZENsaWVudCk7CisgICAgV0tQYWdlU2V0 UGFnZUZpbmRDbGllbnQocGFnZVJlZiwgJmZpbmRDbGllbnQuYmFzZSk7CiB9CiAKIH0gLy8gbmFt ZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9G b3JtQ2xpZW50RWZsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvRm9ybUNsaWVu dEVmbC5jcHAKaW5kZXggMTU1YmVhMjJjYzNkNzk5NTk0YTZjMzYyZGM5MWUwNjA0MDNmYzdkZi4u MzRhOGQ5MDUxZDJmMTg4MDViOGVjMDgyYTc1N2QwYmQyMzBlNDQ5MSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9Gb3JtQ2xpZW50RWZsLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvZWZsL0Zvcm1DbGllbnRFZmwuY3BwCkBAIC01MywxMiArNTMsMTIg QEAgRm9ybUNsaWVudEVmbDo6Rm9ybUNsaWVudEVmbChFd2tWaWV3KiB2aWV3SW1wbCkKICAgICBX S1BhZ2VSZWYgcGFnZVJlZiA9IG1fdmlldy0+d2tQYWdlKCk7CiAgICAgQVNTRVJUKHBhZ2VSZWYp OwogCi0gICAgV0tQYWdlRm9ybUNsaWVudCBmb3JtQ2xpZW50OworICAgIFdLUGFnZUZvcm1DbGll bnRWMCBmb3JtQ2xpZW50OwogICAgIG1lbXNldCgmZm9ybUNsaWVudCwgMCwgc2l6ZW9mKFdLUGFn ZUZvcm1DbGllbnQpKTsKLSAgICBmb3JtQ2xpZW50LnZlcnNpb24gPSBrV0tQYWdlRm9ybUNsaWVu dEN1cnJlbnRWZXJzaW9uOwotICAgIGZvcm1DbGllbnQuY2xpZW50SW5mbyA9IHRoaXM7CisgICAg Zm9ybUNsaWVudC5iYXNlLnZlcnNpb24gPSAwOworICAgIGZvcm1DbGllbnQuYmFzZS5jbGllbnRJ bmZvID0gdGhpczsKICAgICBmb3JtQ2xpZW50LndpbGxTdWJtaXRGb3JtID0gd2lsbFN1Ym1pdEZv cm07Ci0gICAgV0tQYWdlU2V0UGFnZUZvcm1DbGllbnQocGFnZVJlZiwgJmZvcm1DbGllbnQpOwor ICAgIFdLUGFnZVNldFBhZ2VGb3JtQ2xpZW50KHBhZ2VSZWYsICZmb3JtQ2xpZW50LmJhc2UpOwog fQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9lZmwvUGFnZUxvYWRDbGllbnRFZmwuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL2VmbC9QYWdlTG9hZENsaWVudEVmbC5jcHAKaW5kZXggZjViZWMzY2QyMjM3Y2YyZGQzNmZh ZTk5OWQxZmJlMWQ4ZDYyNjliNS4uYjRhNDM5NGNlNzgzMjE5NjNlODg3NmVmM2MxNDcyZDQ1YjIw ZDc4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlTG9hZENs aWVudEVmbC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlTG9hZENs aWVudEVmbC5jcHAKQEAgLTE2MiwxMCArMTYyLDEwIEBAIFBhZ2VMb2FkQ2xpZW50RWZsOjpQYWdl TG9hZENsaWVudEVmbChFd2tWaWV3KiB2aWV3KQogICAgIFdLUGFnZVJlZiBwYWdlUmVmID0gbV92 aWV3LT53a1BhZ2UoKTsKICAgICBBU1NFUlQocGFnZVJlZik7CiAKLSAgICBXS1BhZ2VMb2FkZXJD bGllbnQgbG9hZENsaWVudDsKKyAgICBXS1BhZ2VMb2FkZXJDbGllbnRWMyBsb2FkQ2xpZW50Owog ICAgIG1lbXNldCgmbG9hZENsaWVudCwgMCwgc2l6ZW9mKFdLUGFnZUxvYWRlckNsaWVudCkpOwot ICAgIGxvYWRDbGllbnQudmVyc2lvbiA9IGtXS1BhZ2VMb2FkZXJDbGllbnRDdXJyZW50VmVyc2lv bjsKLSAgICBsb2FkQ2xpZW50LmNsaWVudEluZm8gPSB0aGlzOworICAgIGxvYWRDbGllbnQuYmFz ZS52ZXJzaW9uID0gMzsKKyAgICBsb2FkQ2xpZW50LmJhc2UuY2xpZW50SW5mbyA9IHRoaXM7CiAg ICAgbG9hZENsaWVudC5kaWRSZWNlaXZlVGl0bGVGb3JGcmFtZSA9IGRpZFJlY2VpdmVUaXRsZUZv ckZyYW1lOwogICAgIGxvYWRDbGllbnQuZGlkU3RhcnRQcm9ncmVzcyA9IGRpZENoYW5nZVByb2dy ZXNzOwogICAgIGxvYWRDbGllbnQuZGlkQ2hhbmdlUHJvZ3Jlc3MgPSBkaWRDaGFuZ2VQcm9ncmVz czsKQEAgLTE3OSw3ICsxNzksNyBAQCBQYWdlTG9hZENsaWVudEVmbDo6UGFnZUxvYWRDbGllbnRF ZmwoRXdrVmlldyogdmlldykKICAgICBsb2FkQ2xpZW50LmRpZENoYW5nZUJhY2tGb3J3YXJkTGlz dCA9IGRpZENoYW5nZUJhY2tGb3J3YXJkTGlzdDsKICAgICBsb2FkQ2xpZW50LmRpZFNhbWVEb2N1 bWVudE5hdmlnYXRpb25Gb3JGcmFtZSA9IGRpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JGcmFt ZTsKICAgICBsb2FkQ2xpZW50LmRpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZUluRnJh bWUgPSBkaWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2VJbkZyYW1lOwotICAgIFdLUGFn ZVNldFBhZ2VMb2FkZXJDbGllbnQocGFnZVJlZiwgJmxvYWRDbGllbnQpOworICAgIFdLUGFnZVNl dFBhZ2VMb2FkZXJDbGllbnQocGFnZVJlZiwgJmxvYWRDbGllbnQuYmFzZSk7CiB9CiAKIH0gLy8g bmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2Vm bC9QYWdlUG9saWN5Q2xpZW50RWZsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwv UGFnZVBvbGljeUNsaWVudEVmbC5jcHAKaW5kZXggYzBiMTI3ZGRmNTkzYzdiMGNhYzM5OGJjMGZm NGQ0Mzc4MGU2ZTYwMC4uMTViN2Y0ZTgwMzc4YWI0ZjhhMzkyOWMyNTYxODQ4ZTkyOWZjNDcyNiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlUG9saWN5Q2xpZW50 RWZsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1BhZ2VQb2xpY3lDbGll bnRFZmwuY3BwCkBAIC0xMDUsMTUgKzEwNSwxNSBAQCBQYWdlUG9saWN5Q2xpZW50RWZsOjpQYWdl UG9saWN5Q2xpZW50RWZsKEV3a1ZpZXcqIHZpZXcpCiAgICAgV0tQYWdlUmVmIHBhZ2VSZWYgPSBt X3ZpZXctPndrUGFnZSgpOwogICAgIEFTU0VSVChwYWdlUmVmKTsKIAotICAgIFdLUGFnZVBvbGlj eUNsaWVudCBwb2xpY3lDbGllbnQ7CisgICAgV0tQYWdlUG9saWN5Q2xpZW50VjEgcG9saWN5Q2xp ZW50OwogICAgIG1lbXNldCgmcG9saWN5Q2xpZW50LCAwLCBzaXplb2YoV0tQYWdlUG9saWN5Q2xp ZW50KSk7Ci0gICAgcG9saWN5Q2xpZW50LnZlcnNpb24gPSBrV0tQYWdlUG9saWN5Q2xpZW50Q3Vy cmVudFZlcnNpb247Ci0gICAgcG9saWN5Q2xpZW50LmNsaWVudEluZm8gPSB0aGlzOworICAgIHBv bGljeUNsaWVudC5iYXNlLnZlcnNpb24gPSAxOworICAgIHBvbGljeUNsaWVudC5iYXNlLmNsaWVu dEluZm8gPSB0aGlzOwogICAgIHBvbGljeUNsaWVudC5kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9u QWN0aW9uID0gZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbjsKICAgICBwb2xpY3lDbGll bnQuZGVjaWRlUG9saWN5Rm9yTmV3V2luZG93QWN0aW9uID0gZGVjaWRlUG9saWN5Rm9yTmV3V2lu ZG93QWN0aW9uOwogICAgIHBvbGljeUNsaWVudC5kZWNpZGVQb2xpY3lGb3JSZXNwb25zZSA9IGRl Y2lkZVBvbGljeUZvclJlc3BvbnNlQ2FsbGJhY2s7CiAKLSAgICBXS1BhZ2VTZXRQYWdlUG9saWN5 Q2xpZW50KHBhZ2VSZWYsICZwb2xpY3lDbGllbnQpOworICAgIFdLUGFnZVNldFBhZ2VQb2xpY3lD bGllbnQocGFnZVJlZiwgJnBvbGljeUNsaWVudC5iYXNlKTsKIH0KIAogfSAvLyBuYW1lc3BhY2Ug V2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1BhZ2VVSUNs aWVudEVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1BhZ2VVSUNsaWVudEVm bC5jcHAKaW5kZXggNjkxZTg1N2E5MTc2YzI0MTUwMWNhOTZjNDhhYTU1ZDdhZGI1YTc4Yy4uNmJh YjIzYTc0Mzg4MDhlNjVlYjBkMTMzYzg2OGNkMzFlMzZlZjZlMiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlVUlDbGllbnRFZmwuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUGFnZVVJQ2xpZW50RWZsLmNwcApAQCAtNTIsMTAgKzUyLDEw IEBAIFBhZ2VVSUNsaWVudEVmbDo6UGFnZVVJQ2xpZW50RWZsKEV3a1ZpZXcqIHZpZXcpCiAgICAg V0tQYWdlUmVmIHBhZ2VSZWYgPSBtX3ZpZXctPndrUGFnZSgpOwogICAgIEFTU0VSVChwYWdlUmVm KTsKIAotICAgIFdLUGFnZVVJQ2xpZW50IHVpQ2xpZW50OworICAgIFdLUGFnZVVJQ2xpZW50VjIg dWlDbGllbnQ7CiAgICAgbWVtc2V0KCZ1aUNsaWVudCwgMCwgc2l6ZW9mKFdLUGFnZVVJQ2xpZW50 KSk7Ci0gICAgdWlDbGllbnQudmVyc2lvbiA9IGtXS1BhZ2VVSUNsaWVudEN1cnJlbnRWZXJzaW9u OwotICAgIHVpQ2xpZW50LmNsaWVudEluZm8gPSB0aGlzOworICAgIHVpQ2xpZW50LmJhc2UudmVy c2lvbiA9IDI7CisgICAgdWlDbGllbnQuYmFzZS5jbGllbnRJbmZvID0gdGhpczsKICAgICB1aUNs aWVudC5jbG9zZSA9IGNsb3NlOwogICAgIHVpQ2xpZW50LnRha2VGb2N1cyA9IHRha2VGb2N1czsK ICAgICB1aUNsaWVudC5mb2N1cyA9IGZvY3VzOwpAQCAtODQsNyArODQsNyBAQCBQYWdlVUlDbGll bnRFZmw6OlBhZ2VVSUNsaWVudEVmbChFd2tWaWV3KiB2aWV3KQogICAgIHVpQ2xpZW50LmhpZGVD b2xvclBpY2tlciA9IGhpZGVDb2xvclBpY2tlcjsKICNlbmRpZgogCi0gICAgV0tQYWdlU2V0UGFn ZVVJQ2xpZW50KHBhZ2VSZWYsICZ1aUNsaWVudCk7CisgICAgV0tQYWdlU2V0UGFnZVVJQ2xpZW50 KHBhZ2VSZWYsICZ1aUNsaWVudC5iYXNlKTsKIAogICAgIC8vIFBvcHVwIE1lbnUgVUkgY2xpZW50 LgogICAgIFdLUGFnZVVJUG9wdXBNZW51Q2xpZW50VjAgdWlQb3B1cE1lbnVDbGllbnQ7CkBAIC05 Myw3ICs5Myw3IEBAIFBhZ2VVSUNsaWVudEVmbDo6UGFnZVVJQ2xpZW50RWZsKEV3a1ZpZXcqIHZp ZXcpCiAgICAgdWlQb3B1cE1lbnVDbGllbnQuYmFzZS5jbGllbnRJbmZvID0gdGhpczsKICAgICB1 aVBvcHVwTWVudUNsaWVudC5zaG93UG9wdXBNZW51ID0gc2hvd1BvcHVwTWVudTsKICAgICB1aVBv cHVwTWVudUNsaWVudC5oaWRlUG9wdXBNZW51ID0gaGlkZVBvcHVwTWVudTsKLSAgICBXS1BhZ2VT ZXRVSVBvcHVwTWVudUNsaWVudChwYWdlUmVmLCByZWludGVycHJldF9jYXN0PFdLUGFnZVVJUG9w dXBNZW51Q2xpZW50QmFzZSo+KCZ1aVBvcHVwTWVudUNsaWVudCkpOworICAgIFdLUGFnZVNldFVJ UG9wdXBNZW51Q2xpZW50KHBhZ2VSZWYsICZ1aVBvcHVwTWVudUNsaWVudC5iYXNlKTsKIH0KIAog CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggODU0 ODI2OTZkZmM1OGZiNWE1OTM5ODQwNDMzYmU1NWI0ZTY0OWYzMy4uMjUwMzMwZTlmODM2ZDkzNjdh ZTliNGExYzhiZGE0MzQ2NGRhYWIwZiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBi L1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEzLTEyLTA0ICBDc2FiYSBPc3p0 cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CisKKyAgICAgICAgW0VGTF1bV0syXSBCdWlsZGZp eCBhZnRlciByMTYwMTA0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMjUyMzMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mi9Db29yZGluYXRlZEdyYXBoaWNz L1dLVmlld0lzQWN0aXZlU2V0SXNBY3RpdmUuY3BwOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6 VEVTVCk6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyL2VmbC9XS1ZpZXdD bGllbnRXZWJQcm9jZXNzQ2FsbGJhY2tzLmNwcDoKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OnNl dFBhZ2VMb2FkZXJDbGllbnQpOgorCiAyMDEzLTEyLTAzICBBbmRlcnMgQ2FybHNzb24gIDxhbmRl cnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAgRGVwcmVjYXRlIGFsbCB1bnZlcnNpb25lZCBjbGll bnQgc3RydWN0cyBpbiBmYXZvciBvZiBoYXZpbmcgZXhwbGljaXQgdmVyc2lvbmVkIHN0cnVjdHMK ZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mi9Db29yZGluYXRl ZEdyYXBoaWNzL1dLVmlld0lzQWN0aXZlU2V0SXNBY3RpdmUuY3BwIGIvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9XZWJLaXQyL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV0tWaWV3SXNBY3RpdmVTZXRJ c0FjdGl2ZS5jcHAKaW5kZXggODAzOGJhYTMzMWIxNDBlYTJmNjcxNTdhMGFmYTdmMDhiNGFkZjY4 ZS4uZjNlZDQ0MDk3N2I5NjU4OThiOWFkM2YyMDJiMGZiM2Q1NDc4OTBhNyAxMDA2NDQKLS0tIGEv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV0tW aWV3SXNBY3RpdmVTZXRJc0FjdGl2ZS5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXQyL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV0tWaWV3SXNBY3RpdmVTZXRJc0FjdGl2ZS5j cHAKQEAgLTk5LDExICs5OSwxMSBAQCBURVNUKFdlYktpdDIsIFdLVmlld0lzQWN0aXZlKQogICAg IC8vIEF0IHRoaXMgcG9pbnQgd2Ugc2hvdWxkIGhhdmUgYW4gYWN0aXZlIHZpZXcuCiAgICAgQVNT RVJUX1RSVUUoV0tWaWV3SXNBY3RpdmUodmlldy5nZXQoKSkpOwogCi0gICAgV0tQYWdlTG9hZGVy Q2xpZW50IHBhZ2VMb2FkZXJDbGllbnQ7CisgICAgV0tQYWdlTG9hZGVyQ2xpZW50VjMgcGFnZUxv YWRlckNsaWVudDsKICAgICBtZW1zZXQoJnBhZ2VMb2FkZXJDbGllbnQsIDAsIHNpemVvZihXS1Bh Z2VMb2FkZXJDbGllbnQpKTsKLSAgICBwYWdlTG9hZGVyQ2xpZW50LnZlcnNpb24gPSBrV0tQYWdl TG9hZGVyQ2xpZW50Q3VycmVudFZlcnNpb247CisgICAgcGFnZUxvYWRlckNsaWVudC5iYXNlLnZl cnNpb24gPSAzOwogICAgIHBhZ2VMb2FkZXJDbGllbnQuZGlkRmluaXNoTG9hZEZvckZyYW1lID0g ZGlkRmluaXNoTG9hZEZvckZyYW1lOwotICAgIFdLUGFnZVNldFBhZ2VMb2FkZXJDbGllbnQoV0tW aWV3R2V0UGFnZSh2aWV3LmdldCgpKSwgJnBhZ2VMb2FkZXJDbGllbnQpOworICAgIFdLUGFnZVNl dFBhZ2VMb2FkZXJDbGllbnQoV0tWaWV3R2V0UGFnZSh2aWV3LmdldCgpKSwgJnBhZ2VMb2FkZXJD bGllbnQuYmFzZSk7CiAKICAgICBjb25zdCBXS1NpemUgc2l6ZSA9IFdLU2l6ZU1ha2UoMTAwLCAx MDApOwogICAgIFdLVmlld1NldFNpemUodmlldy5nZXQoKSwgc2l6ZSk7CmRpZmYgLS1naXQgYS9U b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIvZWZsL1dLVmlld0NsaWVudFdlYlByb2Nl c3NDYWxsYmFja3MuY3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyL2VmbC9X S1ZpZXdDbGllbnRXZWJQcm9jZXNzQ2FsbGJhY2tzLmNwcAppbmRleCA4ZGNhNDE3MDExN2E0MmQ1 NTI4ZjNhYTQ1M2Y0Zjk4MDcxYjdjM2ZhLi4xYTMxYzJiZGQ1ZWJhMzA3YjdjZTBiZGM4NzQ0NjEy OWJhMDhhODc4IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIv ZWZsL1dLVmlld0NsaWVudFdlYlByb2Nlc3NDYWxsYmFja3MuY3BwCisrKyBiL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mi9lZmwvV0tWaWV3Q2xpZW50V2ViUHJvY2Vzc0NhbGxiYWNr cy5jcHAKQEAgLTU4LDEzICs1OCwxNCBAQCBzdGF0aWMgdm9pZCBkaWRGaW5pc2hMb2FkRm9yRnJh bWUoV0tQYWdlUmVmLCBXS0ZyYW1lUmVmLCBXS1R5cGVSZWYsIGNvbnN0IHZvaWQqCiAKIHN0YXRp YyB2b2lkIHNldFBhZ2VMb2FkZXJDbGllbnQoV0tQYWdlUmVmIHBhZ2UsIGNvbnN0IHZvaWQqIGNs aWVudEluZm8pCiB7Ci0gICAgV0tQYWdlTG9hZGVyQ2xpZW50IGxvYWRlckNsaWVudDsKKyAgICBX S1BhZ2VMb2FkZXJDbGllbnRWMyBsb2FkZXJDbGllbnQ7CiAgICAgbWVtc2V0KCZsb2FkZXJDbGll bnQsIDAsIHNpemVvZihsb2FkZXJDbGllbnQpKTsKIAorICAgIGxvYWRlckNsaWVudC5iYXNlLnZl cnNpb24gPSAzOworICAgIGxvYWRlckNsaWVudC5iYXNlLmNsaWVudEluZm8gPSBjbGllbnRJbmZv OwogICAgIGxvYWRlckNsaWVudC5kaWRGaW5pc2hMb2FkRm9yRnJhbWUgPSBkaWRGaW5pc2hMb2Fk Rm9yRnJhbWU7Ci0gICAgbG9hZGVyQ2xpZW50LmNsaWVudEluZm8gPSBjbGllbnRJbmZvOwogCi0g ICAgV0tQYWdlU2V0UGFnZUxvYWRlckNsaWVudChwYWdlLCAmbG9hZGVyQ2xpZW50KTsKKyAgICBX S1BhZ2VTZXRQYWdlTG9hZGVyQ2xpZW50KHBhZ2UsICZsb2FkZXJDbGllbnQuYmFzZSk7CiB9CiAK IHZvaWQgd2ViUHJvY2Vzc0NyYXNoZWQoV0tWaWV3UmVmIHZpZXcsIFdLVVJMUmVmIHVybCwgY29u c3Qgdm9pZCogY2xpZW50SW5mbykK