219106 2020-11-18 12:31:06 -0800 [LFC][Integration] Line::enclosingRect should only include the border box (exclude vertical margins) 2020-11-18 14:43:21 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1708715 0 zalan 2020-11-18 12:31:06 -0800 ssia 1708720 1 414471 zalan 2020-11-18 12:45:20 -0800 Created attachment 414471 Patch 1708784 2 ews-feeder 2020-11-18 14:42:43 -0800 Committed r269989: <https://trac.webkit.org/changeset/269989> All reviewed patches have been landed. Closing bug and clearing flags on attachment 414471. 1708786 3 webkit-bug-importer 2020-11-18 14:43:21 -0800 <rdar://problem/71556381> 414471 2020-11-18 12:45:20 -0800 2020-11-18 14:42:43 -0800 Patch bug-219106-20201118124519.patch text/plain 17358 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5OTQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGRlMWI3YWM4Njk3MzQ1 OGFlNmVkNDE1YjhjNmNmMWNhZWQyNTU5NC4uYThmYWZhMGM3YmFiM2M5ZWRjMDIzOWEzMzZjYTVh ZTcwZjBkNDU3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDIwLTExLTE4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSW50ZWdyYXRpb25d IExpbmU6OmVuY2xvc2luZ1JlY3Qgc2hvdWxkIG9ubHkgaW5jbHVkZSB0aGUgYm9yZGVyIGJveCAo ZXhjbHVkZSB2ZXJ0aWNhbCBtYXJnaW5zKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjE5MTA2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTGluZUl0ZXJhdG9yUGF0aDo6dG9wL2JvdHRvbSBleHBlY3RzIGJv cmRlciBib3ggZW5jbG9zaW5nIHZhbHVlcyAoYW5kIG5vdCBtYXJnaW4gYm94IHZhbHVlcykuCisg ICAgICAgIChhbmQgd2hpbGUgd2UgYXJlIGhlcmUsIGxldCdzIGp1c3QgY29tcHV0ZSB0aGUgdmVy dGljYWwgZW5jbG9zaW5nIHZhbHVlcyBhbmQgaWdub3JlIHRoZSBob3Jpem9udGFsIGFzcGVjdCBv ZiBpdCBhcyB0aGUgbGluZSBib3ggYWx3YXlzCisgICAgICAgIGVuY2xvc2VzIGFsbCB0aGUgaW5s aW5lIGxldmVsIGJveGVzIG9uIHRoZSBsaW5lIGFueXdheSkKKworICAgICAgICAqIGxheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVHZW9tZXRyeUZv ckxpbmVDb250ZW50KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVM aW5lQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJveDo6bG9naWNhbE1h cmdpblJlY3RGb3JJbmxpbmVMZXZlbEJveCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkxpbmVCb3g6OmxvZ2ljYWxSZWN0Rm9ySW5saW5lTGV2ZWxCb3ggY29uc3QpOiBEZWxldGVk LgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaDoKKyAg ICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50 QnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6SW5saW5l Q29udGVudEJ1aWxkZXI6OmNyZWF0ZURpc3BsYXlMaW5lcyBjb25zdCk6CisgICAgICAgICogbGF5 b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZS5oOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0SW50ZWdyYXRpb246OkxpbmU6OkxpbmUpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0SW50ZWdyYXRpb246OkxpbmU6OmVuY2xvc2luZ0NvbnRlbnRUb3AgY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxpbmU6OmVuY2xvc2luZ0NvbnRlbnRCb3R0 b20gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OkxpbmU6OmVu Y2xvc2luZ0NvbnRlbnRSZWN0IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBsYXlvdXQvaW50 ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lSXRlcmF0b3JNb2Rlcm5QYXRoLmg6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXRJbnRlZ3JhdGlvbjo6TGluZUl0ZXJhdG9yTW9kZXJuUGF0aDo6 dG9wIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpMaW5lSXRl cmF0b3JNb2Rlcm5QYXRoOjpib3R0b20gY29uc3QpOgorICAgICAgICAqIGxheW91dC9pbnRlZ3Jh dGlvbi9MYXlvdXRJbnRlZ3JhdGlvblBhZ2luYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0SW50ZWdyYXRpb246Om1ha2VBZGp1c3RlZENvbnRlbnQpOgorICAgICAgICAqIGxheW91 dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblJ1bkl0ZXJhdG9yTW9kZXJuUGF0aC5oOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRpb246OlJ1bkl0ZXJhdG9yTW9kZXJuUGF0 aDo6c2VsZWN0aW9uUmVjdCBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2xheW91dHRyZWUvTGF5 b3V0VHJlZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpzaG93SW5saW5l VHJlZUFuZFJ1bnMpOgorCiAyMDIwLTExLTE2ICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBs ZS5jb20+CiAKICAgICAgICAgW0pTQ10gSW1wbGVtZW50IFdlYkFzc2VtYmx5Lk1lbW9yeSB3aXRo IHNoYXJlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IGVmNDIzNmUz ZWFkY2Q5MTMyOWI0NGIyZTNmYTE2MGIwZmQxYTYwNzcuLmQ2YzExNzczZjk2Y2IyYzlmYjBkNGQz ZGNjNTY4MWQ4YTA1YzkzNmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAK QEAgLTQzOCw3ICs0MzgsNyBAQCBJbmxpbmVSZWN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpj b21wdXRlR2VvbWV0cnlGb3JMaW5lQ29udGVudChjb25zdCBMaW5lQnVpbAogICAgICAgICAgICAg aWYgKGxpbmVSdW4uaXNUZXh0KCkgfHwgbGluZVJ1bi5pc0xpbmVCcmVhaygpKQogICAgICAgICAg ICAgICAgIGZvcm1hdHRpbmdTdGF0ZS5hZGRMaW5lUnVuKHsgbGluZUluZGV4LCBsaW5lUnVuLmxh eW91dEJveCgpLCBsaW5lQm94LmxvZ2ljYWxSZWN0Rm9yVGV4dFJ1bihsaW5lUnVuKSwgbGluZVJ1 bi5leHBhbnNpb24oKSwgbGluZVJ1bi50ZXh0Q29udGVudCgpIH0pOwogICAgICAgICAgICAgZWxz ZSBpZiAobGluZVJ1bi5pc0JveCgpKQotICAgICAgICAgICAgICAgIGZvcm1hdHRpbmdTdGF0ZS5h ZGRMaW5lUnVuKHsgbGluZUluZGV4LCBsaW5lUnVuLmxheW91dEJveCgpLCBsaW5lQm94LmxvZ2lj YWxSZWN0Rm9ySW5saW5lTGV2ZWxCb3gobGluZVJ1bi5sYXlvdXRCb3goKSksIGxpbmVSdW4uZXhw YW5zaW9uKCksIHsgfSB9KTsKKyAgICAgICAgICAgICAgICBmb3JtYXR0aW5nU3RhdGUuYWRkTGlu ZVJ1bih7IGxpbmVJbmRleCwgbGluZVJ1bi5sYXlvdXRCb3goKSwgbGluZUJveC5sb2dpY2FsTWFy Z2luUmVjdEZvcklubGluZUxldmVsQm94KGxpbmVSdW4ubGF5b3V0Qm94KCkpLCBsaW5lUnVuLmV4 cGFuc2lvbigpLCB7IH0gfSk7CiAgICAgICAgIH0KICAgICB9OwogICAgIGNvbnN0cnVjdExpbmVS dW5zKCk7CkBAIC00NTUsNyArNDU1LDcgQEAgSW5saW5lUmVjdCBJbmxpbmVGb3JtYXR0aW5nQ29u dGV4dDo6Y29tcHV0ZUdlb21ldHJ5Rm9yTGluZUNvbnRlbnQoY29uc3QgTGluZUJ1aWwKICAgICAg ICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ1N0YXRlLmJveEdlb21ldHJ5KGxh eW91dEJveCk7CiAgICAgICAgICAgICAvLyBJbmxpbmUgYm94IGNvb3JkaW5hdGVzIGFyZSByZWxh dGl2ZSB0byB0aGUgbGluZSBib3guCiAgICAgICAgICAgICAvLyBMZXQncyBjb252ZXJ0IHRvcC9s ZWZ0IHJlbGF0aXZlIHRvIHRoZSBmb3JtYXR0aW5nIGNvbnRleHQgcm9vdC4KLSAgICAgICAgICAg IGF1dG8gbG9naWNhbFJlY3QgPSBsaW5lQm94LmxvZ2ljYWxSZWN0Rm9ySW5saW5lTGV2ZWxCb3go bGF5b3V0Qm94KTsKKyAgICAgICAgICAgIGF1dG8gbG9naWNhbFJlY3QgPSBsaW5lQm94LmxvZ2lj YWxNYXJnaW5SZWN0Rm9ySW5saW5lTGV2ZWxCb3gobGF5b3V0Qm94KTsKICAgICAgICAgICAgIC8v IElubGluZSBib3ggaGVpZ2h0IGluY2x1ZGVzIHRoZSBtYXJnaW4gYm94LiBMZXQncyBhY2NvdW50 IGZvciB0aGF0LgogICAgICAgICAgICAgYXV0byBib3JkZXJCb3hMb2dpY2FsVG9wTGVmdCA9IGxp bmVMb2dpY2FsUmVjdC50b3BMZWZ0KCk7CiAgICAgICAgICAgICBib3JkZXJCb3hMb2dpY2FsVG9w TGVmdC5tb3ZlKGxvZ2ljYWxSZWN0LmxlZnQoKSwgbG9naWNhbFJlY3QudG9wKCkgKyBib3hHZW9t ZXRyeS5tYXJnaW5CZWZvcmUoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3BwCmluZGV4IGMxNmEwNDk0MjVkM2Jm OWI5NjIyMmZhMTk1YzI2MjBkODk0OTgwYWUuLjVhMzUwNjBlNjE5YzlhYzAzZmZjMTFlMDFlMDU0 MDc5MWQ4NjA2MjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3BwCkBAIC0xMTAsNyArMTEwLDcgQEAgSW5saW5l UmVjdCBMaW5lQm94Ojpsb2dpY2FsUmVjdEZvclRleHRSdW4oY29uc3QgTGluZTo6UnVuJiBydW4p IGNvbnN0CiAgICAgcmV0dXJuIHsgcnVubG9naWNhbFRvcCwgbV9ob3Jpem9udGFsQWxpZ25tZW50 T2Zmc2V0LnZhbHVlT3IoSW5saW5lTGF5b3V0VW5pdCB7IH0pICsgcnVuLmxvZ2ljYWxMZWZ0KCks IHJ1bi5sb2dpY2FsV2lkdGgoKSwgbG9naWNhbEhlaWdodCB9OwogfQogCi1JbmxpbmVSZWN0IExp bmVCb3g6OmxvZ2ljYWxSZWN0Rm9ySW5saW5lTGV2ZWxCb3goY29uc3QgQm94JiBsYXlvdXRCb3gp IGNvbnN0CitJbmxpbmVSZWN0IExpbmVCb3g6OmxvZ2ljYWxNYXJnaW5SZWN0Rm9ySW5saW5lTGV2 ZWxCb3goY29uc3QgQm94JiBsYXlvdXRCb3gpIGNvbnN0CiB7CiAgICAgYXV0byogaW5saW5lQm94 ID0gJmlubGluZUxldmVsQm94Rm9yTGF5b3V0Qm94KGxheW91dEJveCk7CiAgICAgaWYgKGlubGlu ZUJveC0+aGFzTGluZUJveFJlbGF0aXZlQWxpZ25tZW50KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmggYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmgKaW5kZXggNmUy MTBmOGFiZWQ3MjU1YzQ2MDkzYzVlYTYzMTUwMzhjNmMxYjQ3Zi4uZmZjNGFmYjk5MzRiZDE3ZWUz ZGI1Nzc2ZjkwMmQzYTg3MWQ1NTgxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaApAQCAtMTQxLDcgKzE0MSw3IEBA IHB1YmxpYzoKICAgICBjb25zdCBJbmxpbmVMZXZlbEJveCYgaW5saW5lTGV2ZWxCb3hGb3JMYXlv dXRCb3goY29uc3QgQm94JiBsYXlvdXRCb3gpIGNvbnN0IHsgcmV0dXJuICptX2lubGluZUxldmVs Qm94UmVjdE1hcC5nZXQoJmxheW91dEJveCk7IH0KIAogICAgIElubGluZVJlY3QgbG9naWNhbFJl Y3RGb3JUZXh0UnVuKGNvbnN0IExpbmU6OlJ1biYpIGNvbnN0OwotICAgIElubGluZVJlY3QgbG9n aWNhbFJlY3RGb3JJbmxpbmVMZXZlbEJveChjb25zdCBCb3gmKSBjb25zdDsKKyAgICBJbmxpbmVS ZWN0IGxvZ2ljYWxNYXJnaW5SZWN0Rm9ySW5saW5lTGV2ZWxCb3goY29uc3QgQm94JikgY29uc3Q7 CiAKICAgICBhdXRvIGlubGluZUxldmVsQm94TGlzdCgpIGNvbnN0IHsgcmV0dXJuIG1faW5saW5l TGV2ZWxCb3hSZWN0TWFwLnZhbHVlcygpOyB9CiAgICAgYm9vbCBjb250YWluc0lubGluZUxldmVs Qm94KGNvbnN0IEJveCYgbGF5b3V0Qm94KSBjb25zdCB7IHJldHVybiBtX2lubGluZUxldmVsQm94 UmVjdE1hcC5jb250YWlucygmbGF5b3V0Qm94KTsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uSW5saW5lQ29udGVudEJ1aWxk ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0 aW9uSW5saW5lQ29udGVudEJ1aWxkZXIuY3BwCmluZGV4IGM2ZmI4Y2RiYmIwNjM3Yjc5ZmQ5OWFm Yzc5YWEzYzM1YTQwYjUyYjcuLmZmZTczMzc5MmI3ZTg2ZmNmNmNlODE4YWY4ZmE3ODVlOGEzYWY5 MmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJ bnRlZ3JhdGlvbklubGluZUNvbnRlbnRCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25JbmxpbmVDb250ZW50QnVpbGRlci5j cHAKQEAgLTMxNywyNSArMzE3LDM0IEBAIHZvaWQgSW5saW5lQ29udGVudEJ1aWxkZXI6OmNyZWF0 ZURpc3BsYXlMaW5lcyhjb25zdCBMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdTdGF0CiAgICAgICAg ICAgICBsaW5lSW5rT3ZlcmZsb3dSZWN0LnVuaXRlKHJ1bnNbcnVuSW5kZXgrK10uaW5rT3ZlcmZs b3coKSk7CiAgICAgICAgIGF1dG8gcnVuQ291bnQgPSBydW5JbmRleCAtIGZpcnN0UnVuSW5kZXg7 CiAgICAgICAgIGF1dG8gbGluZVJlY3QgPSBGbG9hdFJlY3QgeyBsaW5lLmxvZ2ljYWxSZWN0KCkg fTsKLSAgICAgICAgYXV0byBlbmNsb3NpbmdDb250ZW50UmVjdCA9IFsmXSB7CisgICAgICAgIGF1 dG8gZW5jbG9zaW5nVG9wQW5kQm90dG9tID0gWyZdIHsKICAgICAgICAgICAgIC8vIExldCdzICh2 ZXJ0aWNhbGx5KWVuY2xvc2UgYWxsIHRoZSBpbmxpbmUgbGV2ZWwgYm94ZXMuCiAgICAgICAgICAg ICAvLyBUaGlzIG1vc3RseSBtYXRjaGVzICdsaW5lUmVjdCcsIHVubGVzcyBsaW5lLWhlaWdodCB0 cmlnZ2VycyBsaW5lIGJveCBvdmVyZmxvdyAobm90IHRvIGJlIGNvbmZ1c2VkIHdpdGggaW5rIG9y IHNjcm9sbCBvdmVyZmxvdykuCi0gICAgICAgICAgICBhdXRvIGVuY2xvc2luZ1JlY3QgPSBGbG9h dFJlY3QgeyBsaW5lUmVjdC5sb2NhdGlvbigpLCBsaW5lQm94TG9naWNhbFNpemUgfTsKKyAgICAg ICAgICAgIGF1dG8gZW5jbG9zaW5nVG9wID0gT3B0aW9uYWw8ZmxvYXQ+IHsgfTsKKyAgICAgICAg ICAgIGF1dG8gZW5jbG9zaW5nQm90dG9tID0gT3B0aW9uYWw8ZmxvYXQ+IHsgfTsKICAgICAgICAg ICAgIGF1dG8mIGxpbmVCb3ggPSBsaW5lQm94ZXNbbGluZUluZGV4XTsKICAgICAgICAgICAgIGZv ciAoYXV0byYgaW5saW5lTGV2ZWxCb3ggOiBsaW5lQm94LmlubGluZUxldmVsQm94TGlzdCgpKSB7 Ci0gICAgICAgICAgICAgICAgYXV0byBpbmxpbmVMZXZlbEJveExvZ2ljYWxSZWN0ID0gbGluZUJv eC5sb2dpY2FsUmVjdEZvcklubGluZUxldmVsQm94KGlubGluZUxldmVsQm94LT5sYXlvdXRCb3go KSk7Ci0gICAgICAgICAgICAgICAgLy8gaW5saW5lTGV2ZWxCb3hMb2dpY2FsUmVjdCBpcyByZWxh dGl2ZSB0byB0aGUgbGluZS4KLSAgICAgICAgICAgICAgICBpbmxpbmVMZXZlbEJveExvZ2ljYWxS ZWN0Lm1vdmVCeShsaW5lUmVjdC5sb2NhdGlvbigpKTsKLSAgICAgICAgICAgICAgICBlbmNsb3Np bmdSZWN0LnNldFkoc3RkOjptaW4oZW5jbG9zaW5nUmVjdC55KCksIGlubGluZUxldmVsQm94TG9n aWNhbFJlY3QudG9wKCkpKTsKLSAgICAgICAgICAgICAgICBlbmNsb3NpbmdSZWN0LnNoaWZ0TWF4 WUVkZ2VUbyhzdGQ6Om1heChlbmNsb3NpbmdSZWN0Lm1heFkoKSwgaW5saW5lTGV2ZWxCb3hMb2dp Y2FsUmVjdC5ib3R0b20oKSkpOworICAgICAgICAgICAgICAgIGF1dG8mIGxheW91dEJveCA9IGlu bGluZUxldmVsQm94LT5sYXlvdXRCb3goKTsKKyAgICAgICAgICAgICAgICBhdXRvIGlubGluZUxl dmVsQm94TG9naWNhbFJlY3QgPSBsaW5lQm94LmxvZ2ljYWxNYXJnaW5SZWN0Rm9ySW5saW5lTGV2 ZWxCb3gobGF5b3V0Qm94KTsKKyAgICAgICAgICAgICAgICAvLyBpbmxpbmVMZXZlbEJveExvZ2lj YWxSZWN0IGVuY2xvc2VzIHRoZSBtYXJnaW4gYm94LCBidXQgd2UgbmVlZCBib3JkZXIgYm94IGZv ciB0aGUgZGlzcGxheSBsaW5lLgorICAgICAgICAgICAgICAgIGF1dG8mIGdlb21ldHJ5ID0gbV9s YXlvdXRTdGF0ZS5nZW9tZXRyeUZvckJveChsYXlvdXRCb3gpOworICAgICAgICAgICAgICAgIGlu bGluZUxldmVsQm94TG9naWNhbFJlY3QuZXhwYW5kVmVydGljYWxseSgtc3RkOjptYXgoMF9sdSwg Z2VvbWV0cnkubWFyZ2luQmVmb3JlKCkgKyBnZW9tZXRyeS5tYXJnaW5BZnRlcigpKSk7CisgICAg ICAgICAgICAgICAgaW5saW5lTGV2ZWxCb3hMb2dpY2FsUmVjdC5tb3ZlVmVydGljYWxseShzdGQ6 Om1heCgwX2x1LCBnZW9tZXRyeS5tYXJnaW5CZWZvcmUoKSkpOworCisgICAgICAgICAgICAgICAg ZW5jbG9zaW5nVG9wID0gc3RkOjptaW4oZW5jbG9zaW5nVG9wLnZhbHVlT3IoaW5saW5lTGV2ZWxC b3hMb2dpY2FsUmVjdC50b3AoKSksIGlubGluZUxldmVsQm94TG9naWNhbFJlY3QudG9wKCkpOwor ICAgICAgICAgICAgICAgIGVuY2xvc2luZ0JvdHRvbSA9IHN0ZDo6bWF4KGVuY2xvc2luZ0JvdHRv bS52YWx1ZU9yKGlubGluZUxldmVsQm94TG9naWNhbFJlY3QuYm90dG9tKCkpLCBpbmxpbmVMZXZl bEJveExvZ2ljYWxSZWN0LmJvdHRvbSgpKTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHJl dHVybiBlbmNsb3NpbmdSZWN0OworICAgICAgICAgICAgLy8gVGhlcmUncyBhbHdheXMgYXQgbGVh c3Qgb25lIGlubGluZSBsZXZlbCBib3gsIHRoZSByb290IGlubGluZSBib3guCisgICAgICAgICAg ICBBU1NFUlQoZW5jbG9zaW5nQm90dG9tICYmIGVuY2xvc2luZ1RvcCk7CisgICAgICAgICAgICAv LyBpbmxpbmUgYm94ZXMgYXJlIHJlbGF0aXZlIHRvIHRoZSBsaW5lLCBsZXQncyBtYWtlIHRoZW0g cmVsYXRpdmUgdG8gdGhlIHJvb3QncyBjb250ZW50IGJveC4KKyAgICAgICAgICAgIHJldHVybiBM aW5lOjpFbmNsb3NpbmdUb3BBbmRCb3R0b20geyBsaW5lUmVjdC55KCkgKyAqZW5jbG9zaW5nVG9w LCBsaW5lUmVjdC55KCkgKyAqZW5jbG9zaW5nQm90dG9tIH07CiAgICAgICAgIH0oKTsKICAgICAg ICAgaWYgKGxpbmVMZXZlbFZpc3VhbEFkanVzdG1lbnRzRm9yUnVuc1tsaW5lSW5kZXhdLm5lZWRz SW50ZWdyYWxQb3NpdGlvbikgewogICAgICAgICAgICAgbGluZVJlY3Quc2V0WShyb3VuZFRvSW50 KGxpbmVSZWN0LnkoKSkpOwotICAgICAgICAgICAgZW5jbG9zaW5nQ29udGVudFJlY3Quc2V0WShy b3VuZFRvSW50KGVuY2xvc2luZ0NvbnRlbnRSZWN0LnkoKSkpOworICAgICAgICAgICAgZW5jbG9z aW5nVG9wQW5kQm90dG9tLnRvcCA9IHJvdW5kVG9JbnQoZW5jbG9zaW5nVG9wQW5kQm90dG9tLnRv cCk7CisgICAgICAgICAgICBlbmNsb3NpbmdUb3BBbmRCb3R0b20uYm90dG9tID0gcm91bmRUb0lu dChlbmNsb3NpbmdUb3BBbmRCb3R0b20uYm90dG9tKTsKICAgICAgICAgfQotICAgICAgICBpbmxp bmVDb250ZW50LmxpbmVzLmFwcGVuZCh7IGZpcnN0UnVuSW5kZXgsIHJ1bkNvdW50LCBsaW5lUmVj dCwgbGluZUJveExvZ2ljYWxTaXplLndpZHRoKCksIGVuY2xvc2luZ0NvbnRlbnRSZWN0LCBzY3Jv bGxhYmxlT3ZlcmZsb3dSZWN0LCBsaW5lSW5rT3ZlcmZsb3dSZWN0LCBsaW5lLmJhc2VsaW5lKCks IGxpbmUuaG9yaXpvbnRhbEFsaWdubWVudE9mZnNldCgpIH0pOworICAgICAgICBpbmxpbmVDb250 ZW50LmxpbmVzLmFwcGVuZCh7IGZpcnN0UnVuSW5kZXgsIHJ1bkNvdW50LCBsaW5lUmVjdCwgbGlu ZUJveExvZ2ljYWxTaXplLndpZHRoKCksIGVuY2xvc2luZ1RvcEFuZEJvdHRvbSwgc2Nyb2xsYWJs ZU92ZXJmbG93UmVjdCwgbGluZUlua092ZXJmbG93UmVjdCwgbGluZS5iYXNlbGluZSgpLCBsaW5l Lmhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQoKSB9KTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmUu aCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxp bmUuaAppbmRleCBjOTAyY2Q5MWI1YzQ5MzgxZjQ4MTMwYzViMThmMGE1M2Y3NGZkNjFlLi45Njkw NWE4M2NhMGExNjliYTVjMjQ0NmNkYWJiMTBiYmFhMzkyZmNhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lLmgKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZS5o CkBAIC0zNSwxMiArMzUsMTcgQEAgbmFtZXNwYWNlIExheW91dEludGVncmF0aW9uIHsKIGNsYXNz IExpbmUgewogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogcHVibGljOgotICAgIExpbmUo c2l6ZV90IGZpcnN0UnVuSW5kZXgsIHNpemVfdCBydW5Db3VudCwgY29uc3QgRmxvYXRSZWN0JiBs aW5lUmVjdCwgZmxvYXQgbGluZUJveFdpZHRoLCBjb25zdCBGbG9hdFJlY3QmIGVuY2xvc2luZ0Nv bnRlbnRSZWN0LCBjb25zdCBGbG9hdFJlY3QmIHNjcm9sbGFibGVPdmVyZmxvdywgY29uc3QgRmxv YXRSZWN0JiBpbmtPdmVyZmxvdywgZmxvYXQgYmFzZWxpbmUsIGZsb2F0IGhvcml6b250YWxBbGln bm1lbnRPZmZzZXQpCisgICAgc3RydWN0IEVuY2xvc2luZ1RvcEFuZEJvdHRvbSB7CisgICAgICAg IC8vIFRoaXMgdmFsdWVzIGVuY2xvc2VzIHRoZSByb290IGlubGluZSBib3ggYW5kIGFueSBvdGhl ciBpbmxpbmUgbGV2ZWwgYm94J3MgYm9yZGVyIGJveC4KKyAgICAgICAgZmxvYXQgdG9wIHsgMCB9 OworICAgICAgICBmbG9hdCBib3R0b20geyAwIH07CisgICAgfTsKKyAgICBMaW5lKHNpemVfdCBm aXJzdFJ1bkluZGV4LCBzaXplX3QgcnVuQ291bnQsIGNvbnN0IEZsb2F0UmVjdCYgbGluZVJlY3Qs IGZsb2F0IGxpbmVCb3hXaWR0aCwgRW5jbG9zaW5nVG9wQW5kQm90dG9tIGVuY2xvc2luZ1RvcEFu ZEJvdHRvbSwgY29uc3QgRmxvYXRSZWN0JiBzY3JvbGxhYmxlT3ZlcmZsb3csIGNvbnN0IEZsb2F0 UmVjdCYgaW5rT3ZlcmZsb3csIGZsb2F0IGJhc2VsaW5lLCBmbG9hdCBob3Jpem9udGFsQWxpZ25t ZW50T2Zmc2V0KQogICAgICAgICA6IG1fZmlyc3RSdW5JbmRleChmaXJzdFJ1bkluZGV4KQogICAg ICAgICAsIG1fcnVuQ291bnQocnVuQ291bnQpCiAgICAgICAgICwgbV9saW5lUmVjdChsaW5lUmVj dCkKICAgICAgICAgLCBtX2xpbmVCb3hXaWR0aChsaW5lQm94V2lkdGgpCi0gICAgICAgICwgbV9l bmNsb3NpbmdDb250ZW50UmVjdChlbmNsb3NpbmdDb250ZW50UmVjdCkKKyAgICAgICAgLCBtX2Vu Y2xvc2luZ1RvcEFuZEJvdHRvbShlbmNsb3NpbmdUb3BBbmRCb3R0b20pCiAgICAgICAgICwgbV9z Y3JvbGxhYmxlT3ZlcmZsb3coc2Nyb2xsYWJsZU92ZXJmbG93KQogICAgICAgICAsIG1faW5rT3Zl cmZsb3coaW5rT3ZlcmZsb3cpCiAgICAgICAgICwgbV9iYXNlbGluZShiYXNlbGluZSkKQEAgLTUy LDcgKzU3LDggQEAgcHVibGljOgogICAgIHNpemVfdCBydW5Db3VudCgpIGNvbnN0IHsgcmV0dXJu IG1fcnVuQ291bnQ7IH0KICAgICBjb25zdCBGbG9hdFJlY3QmIHJlY3QoKSBjb25zdCB7IHJldHVy biBtX2xpbmVSZWN0OyB9CiAgICAgZmxvYXQgbGluZUJveFdpZHRoKCkgY29uc3QgeyByZXR1cm4g bV9saW5lQm94V2lkdGg7IH0KLSAgICBjb25zdCBGbG9hdFJlY3QmIGVuY2xvc2luZ0NvbnRlbnRS ZWN0KCkgY29uc3QgeyByZXR1cm4gbV9lbmNsb3NpbmdDb250ZW50UmVjdDsgfQorICAgIGZsb2F0 IGVuY2xvc2luZ0NvbnRlbnRUb3AoKSBjb25zdCB7IHJldHVybiBtX2VuY2xvc2luZ1RvcEFuZEJv dHRvbS50b3A7IH0KKyAgICBmbG9hdCBlbmNsb3NpbmdDb250ZW50Qm90dG9tKCkgY29uc3QgeyBy ZXR1cm4gbV9lbmNsb3NpbmdUb3BBbmRCb3R0b20uYm90dG9tOyB9CiAgICAgY29uc3QgRmxvYXRS ZWN0JiBzY3JvbGxhYmxlT3ZlcmZsb3coKSBjb25zdCB7IHJldHVybiBtX3Njcm9sbGFibGVPdmVy ZmxvdzsgfQogICAgIGNvbnN0IEZsb2F0UmVjdCYgaW5rT3ZlcmZsb3coKSBjb25zdCB7IHJldHVy biBtX2lua092ZXJmbG93OyB9CiAgICAgZmxvYXQgYmFzZWxpbmUoKSBjb25zdCB7IHJldHVybiBt X2Jhc2VsaW5lOyB9CkBAIC02MywxMSArNjksMTEgQEAgcHJpdmF0ZToKICAgICBzaXplX3QgbV9y dW5Db3VudCB7IDAgfTsKICAgICAvLyBMaW5lIGlzIGFsd2F5cyBhcyB0YWxsIGFzIHRoZSBsaW5l IGJveCBpcy4gSG93ZXZlciB0aGV5IG1heSBkaWZmZXIgaW4gd2lkdGguCiAgICAgLy8gV2hpbGUg bGluZSBib3ggZW5jbG9zZXMgYWxsIHRoZSBpbmxpbmUgbGV2ZWwgYm94ZXMgb24gdGhlIGxpbmUg aG9yaXpvbnRhbGx5LCB0aGUgbGluZSBpdHNlbGYgbWF5IGJlIHNob3J0ZXIgKGFuZCB0cmlnZ2Vy IGhvcml6b250YWwgb3ZlcmZsb3cpLgotICAgIC8vIEVuY2xvc2luZyBjb250ZW50IHJlY3QgaW5j bHVkZXMgYWxsIGlubGluZSBsZXZlbCBib3hlcyBib3RoIHZlcnRpY2FsbHkgYW5kIGhvcml6b250 YWxseS4gSW4gY2VydGFpbiBjYXNlcyAoc2VlIGxpbmUtaGVpZ2h0IHByb3BlcnR5KQorICAgIC8v IEVuY2xvc2luZyB0b3AgYW5kIGJvdHRvbSBpbmNsdWRlcyBhbGwgaW5saW5lIGxldmVsIGJveGVz IChib3JkZXIgYm94KSB2ZXJ0aWNhbGx5LiBJbiBjZXJ0YWluIGNhc2VzIChzZWUgbGluZS1oZWln aHQgcHJvcGVydHkpCiAgICAgLy8gdGhlIGxpbmUgKGFuZCB0aGUgbGluZSBib3gpIGlzIG5vdCBh cyB0YWxsIGFzIHRoZSBpbmxpbmUgbGV2ZWwgYm94ZXMgb24gdGhlIGxpbmUuCiAgICAgRmxvYXRS ZWN0IG1fbGluZVJlY3Q7CiAgICAgZmxvYXQgbV9saW5lQm94V2lkdGggeyAwIH07Ci0gICAgRmxv YXRSZWN0IG1fZW5jbG9zaW5nQ29udGVudFJlY3Q7CisgICAgRW5jbG9zaW5nVG9wQW5kQm90dG9t IG1fZW5jbG9zaW5nVG9wQW5kQm90dG9tOwogICAgIEZsb2F0UmVjdCBtX3Njcm9sbGFibGVPdmVy ZmxvdzsKICAgICBGbG9hdFJlY3QgbV9pbmtPdmVyZmxvdzsKICAgICBmbG9hdCBtX2Jhc2VsaW5l IHsgMCB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xh eW91dEludGVncmF0aW9uTGluZUl0ZXJhdG9yTW9kZXJuUGF0aC5oIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUl0ZXJhdG9yTW9kZXJuUGF0 aC5oCmluZGV4IDY1MTVhMTVkNTZiYmM5MmQ1YzI4M2ZiZWJlNGY4YTNhNDI4MWJmZDMuLjU0YWIx NjRmNTUyY2FhMzcwZDBmOWZiZTY5MzljOGU5MGQwZmRjMjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmVJdGVyYXRvck1v ZGVyblBhdGguaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0 SW50ZWdyYXRpb25MaW5lSXRlcmF0b3JNb2Rlcm5QYXRoLmgKQEAgLTQ5LDggKzQ5LDggQEAgcHVi bGljOgogICAgIExpbmVJdGVyYXRvck1vZGVyblBhdGgmIG9wZXJhdG9yPShjb25zdCBMaW5lSXRl cmF0b3JNb2Rlcm5QYXRoJikgPSBkZWZhdWx0OwogICAgIExpbmVJdGVyYXRvck1vZGVyblBhdGgm IG9wZXJhdG9yPShMaW5lSXRlcmF0b3JNb2Rlcm5QYXRoJiYpID0gZGVmYXVsdDsKIAotICAgIExh eW91dFVuaXQgdG9wKCkgY29uc3QgeyByZXR1cm4gTGF5b3V0VW5pdDo6ZnJvbUZsb2F0Um91bmQo bGluZSgpLmVuY2xvc2luZ0NvbnRlbnRSZWN0KCkueSgpKTsgfQotICAgIExheW91dFVuaXQgYm90 dG9tKCkgY29uc3QgeyByZXR1cm4gTGF5b3V0VW5pdDo6ZnJvbUZsb2F0Um91bmQobGluZSgpLmVu Y2xvc2luZ0NvbnRlbnRSZWN0KCkubWF4WSgpKTsgfQorICAgIExheW91dFVuaXQgdG9wKCkgY29u c3QgeyByZXR1cm4gTGF5b3V0VW5pdDo6ZnJvbUZsb2F0Um91bmQobGluZSgpLmVuY2xvc2luZ0Nv bnRlbnRUb3AoKSk7IH0KKyAgICBMYXlvdXRVbml0IGJvdHRvbSgpIGNvbnN0IHsgcmV0dXJuIExh eW91dFVuaXQ6OmZyb21GbG9hdFJvdW5kKGxpbmUoKS5lbmNsb3NpbmdDb250ZW50Qm90dG9tKCkp OyB9CiAgICAgTGF5b3V0VW5pdCBsaW5lQm94VG9wKCkgY29uc3QgeyByZXR1cm4gTGF5b3V0VW5p dDo6ZnJvbUZsb2F0Um91bmQobGluZSgpLnJlY3QoKS55KCkpOyB9CiAgICAgTGF5b3V0VW5pdCBs aW5lQm94Qm90dG9tKCkgY29uc3QgeyByZXR1cm4gTGF5b3V0VW5pdDo6ZnJvbUZsb2F0Um91bmQo bGluZSgpLnJlY3QoKS5tYXhZKCkpOyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblBhZ2luYXRpb24uY3BwIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uUGFnaW5hdGlvbi5j cHAKaW5kZXggYzI3NzY3MTA2MDE4NjliNDA1YTVjNmIzNGQwNGY2YTlmOTI0MWQyMC4uZDhmYmU3 OWI3ZTRiZTY5M2M4NGU3NmQzY2M1M2UwNmRkOGFjMjRhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uUGFnaW5hdGlvbi5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9u UGFnaW5hdGlvbi5jcHAKQEAgLTEzMSw3ICsxMzEsNyBAQCBzdGF0aWMgUmVmPElubGluZUNvbnRl bnQ+IG1ha2VBZGp1c3RlZENvbnRlbnQoY29uc3QgSW5saW5lQ29udGVudCYgaW5saW5lQ29udGVu dAogICAgICAgICAgICAgbGluZS5ydW5Db3VudCgpLAogICAgICAgICAgICAgbW92ZVZlcnRpY2Fs bHkobGluZS5yZWN0KCksIG9mZnNldCksCiAgICAgICAgICAgICBsaW5lLnJlY3QoKS53aWR0aCgp LAotICAgICAgICAgICAgbW92ZVZlcnRpY2FsbHkobGluZS5lbmNsb3NpbmdDb250ZW50UmVjdCgp LCBvZmZzZXQpLAorICAgICAgICAgICAgeyBsaW5lLmVuY2xvc2luZ0NvbnRlbnRUb3AoKSArIG9m ZnNldCwgbGluZS5lbmNsb3NpbmdDb250ZW50Qm90dG9tKCkgKyBvZmZzZXQgfSwKICAgICAgICAg ICAgIG1vdmVWZXJ0aWNhbGx5KGxpbmUuc2Nyb2xsYWJsZU92ZXJmbG93KCksIG9mZnNldCksCiAg ICAgICAgICAgICBtb3ZlVmVydGljYWxseShsaW5lLmlua092ZXJmbG93KCksIG9mZnNldCksCiAg ICAgICAgICAgICBsaW5lLmJhc2VsaW5lKCksCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25SdW5JdGVyYXRvck1vZGVyblBhdGgu aCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblJ1 bkl0ZXJhdG9yTW9kZXJuUGF0aC5oCmluZGV4IGMxZjVjYzBlZThhNDc4MWUxNWUxZGY4ZTJmMGY2 NjhmNWQ0MzIxNDEuLmY5N2RkNjY2MTk0ZDY3ZmI5M2QzNDkxODhjYjZjZjY5YjA4NmQ2ZDQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3Jh dGlvblJ1bkl0ZXJhdG9yTW9kZXJuUGF0aC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblJ1bkl0ZXJhdG9yTW9kZXJuUGF0aC5oCkBAIC0x MTcsOCArMTE3LDggQEAgcHVibGljOgogICAgICAgICBhdXRvIGxvZ2ljYWxXaWR0aCA9IGxvZ2lj YWxSaWdodCAtIGxvZ2ljYWxMZWZ0OwogCiAgICAgICAgIC8vIEZJWE1FOiBUaGVzZSBzaG91bGQg c2hhcmUgaW1wbGVtZW50YXRpb24gd2l0aCB0aGUgbGluZSBpdGVyYXRvci4KLSAgICAgICAgYXV0 byBzZWxlY3Rpb25Ub3AgPSBMYXlvdXRVbml0Ojpmcm9tRmxvYXRSb3VuZChsaW5lKCkuZW5jbG9z aW5nQ29udGVudFJlY3QoKS55KCkpOwotICAgICAgICBhdXRvIHNlbGVjdGlvbkhlaWdodCA9IExh eW91dFVuaXQ6OmZyb21GbG9hdFJvdW5kKGxpbmUoKS5lbmNsb3NpbmdDb250ZW50UmVjdCgpLmhl aWdodCgpKTsKKyAgICAgICAgYXV0byBzZWxlY3Rpb25Ub3AgPSBMYXlvdXRVbml0Ojpmcm9tRmxv YXRSb3VuZChsaW5lKCkuZW5jbG9zaW5nQ29udGVudFRvcCgpKTsKKyAgICAgICAgYXV0byBzZWxl Y3Rpb25IZWlnaHQgPSBMYXlvdXRVbml0Ojpmcm9tRmxvYXRSb3VuZChsaW5lKCkuZW5jbG9zaW5n Q29udGVudEJvdHRvbSgpIC0gbGluZSgpLmVuY2xvc2luZ0NvbnRlbnRUb3AoKSk7CiAKICAgICAg ICAgTGF5b3V0UmVjdCBzZWxlY3Rpb25SZWN0IHsgbG9naWNhbExlZnQsIHNlbGVjdGlvblRvcCwg bG9naWNhbFdpZHRoLCBzZWxlY3Rpb25IZWlnaHQgfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0VHJlZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2xheW91dHRyZWUvTGF5b3V0VHJlZUJ1aWxkZXIuY3BwCmluZGV4IDU4MDY4 YTQ4NjM0M2IzYTg5MGUxMjRkZDAzYWFiNTY5MTM0ZjAwOWYuLjc2ZjM0MjU0OGIyOGYwZTA3ZmQ4 MWQ4YTQwODYyZmY2ZWEwYmViZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9s YXlvdXR0cmVlL0xheW91dFRyZWVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvbGF5b3V0dHJlZS9MYXlvdXRUcmVlQnVpbGRlci5jcHAKQEAgLTQxNSw3ICs0MTUsNyBAQCB2 b2lkIHNob3dJbmxpbmVUcmVlQW5kUnVucyhUZXh0U3RyZWFtJiBzdHJlYW0sIGNvbnN0IExheW91 dFN0YXRlJiBsYXlvdXRTdGF0ZSwgYwogICAgICAgICAgICAgICAgIHN0cmVhbSA8PCAiR2VuZXJp YyBpbmxpbmUgYm94IjsKICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICBzdHJlYW0g PDwgIkdlbmVyaWMgaW5saW5lIGxldmVsIGJveCI7Ci0gICAgICAgICAgICBhdXRvIGxvZ2ljYWxS ZWN0ID0gbGluZUJveC5sb2dpY2FsUmVjdEZvcklubGluZUxldmVsQm94KGlubGluZUxldmVsQm94 LmxheW91dEJveCgpKTsKKyAgICAgICAgICAgIGF1dG8gbG9naWNhbFJlY3QgPSBsaW5lQm94Lmxv Z2ljYWxNYXJnaW5SZWN0Rm9ySW5saW5lTGV2ZWxCb3goaW5saW5lTGV2ZWxCb3gubGF5b3V0Qm94 KCkpOwogICAgICAgICAgICAgc3RyZWFtCiAgICAgICAgICAgICAgICAgPDwgIiBhdCAoIiA8PCBs b2dpY2FsUmVjdC5sZWZ0KCkgPDwgIiwiIDw8IGxvZ2ljYWxSZWN0LnRvcCgpIDw8ICIpIgogICAg ICAgICAgICAgICAgIDw8ICIgc2l6ZSAoIiA8PCBsb2dpY2FsUmVjdC53aWR0aCgpIDw8ICJ4IiA8 PCBsb2dpY2FsUmVjdC5oZWlnaHQoKSA8PCAiKSIK