220045 2020-12-20 08:09:27 -0800 [LFC][IFC] Let's create the run and update the box geometry in one go for atomic inline level boxes 2020-12-20 10:56:41 -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 1715943 0 zalan 2020-12-20 08:09:27 -0800 ssia 1715944 1 416583 zalan 2020-12-20 08:16:07 -0800 Created attachment 416583 Patch 1715947 2 webkit-bug-importer 2020-12-20 10:05:33 -0800 <rdar://problem/72529953> 1715948 3 ews-feeder 2020-12-20 10:56:40 -0800 Committed r271014: <https://trac.webkit.org/changeset/271014> All reviewed patches have been landed. Closing bug and clearing flags on attachment 416583. 416583 2020-12-20 08:16:07 -0800 2020-12-20 10:56:41 -0800 Patch bug-220045-20201220081606.patch text/plain 11239 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMDAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2M3NTFiYTJkOTljNjlm ZWFjZmQ0YmU5YzljYmE3YTQ5MzczMzJjMC4uOGE5ODRmOGE3NWZhZTM5MGI5OWFjOTUyOTEwOGFj N2U5OTc2ZjM0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIwLTEyLTIwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBMZXQncyBj cmVhdGUgdGhlIHJ1biBhbmQgdXBkYXRlIHRoZSBib3ggZ2VvbWV0cnkgaW4gb25lIGdvIGZvciBh dG9taWMgaW5saW5lIGxldmVsIGJveGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMjAwNDUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBMZXQncyBub3QgcnVuIHRoZSAic2FtZSIgbG9vcCB0d2ljZSBvbiBh dG9taWMgaW5saW5lIGxldmVsIGJveGVzIChmaXJzdCB3aGVuIHdlIGNyZWF0ZSB0aGUgbGluZSBy dW4gYW5kIHRoZSBzZWNvbmQgdGltZSB3ZQorICAgICAgICB3ZSB1cGRhdGUgdGhlIGFzc29jaWF0 ZWQgdGhlIGJveCBnZW9tZXRyeSkuIFVuZm9ydHVuYXRlbHkgd2Ugc3RpbGwgaGF2ZSB0byBydW4g YSBzZWNvbmQgcGFzcyBvbiB0aGUgaW5saW5lIGJveGVzIChlLmcgPHNwYW4+KSBhcworICAgICAg ICB0aGV5IGJlaGF2ZSBhcyBjb250YWluZXJzICh0aGVyZSdzIHJvb20gZm9yIGltcHJvdmVtZW50 IGhlcmUgdG9vKS4KKworICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9y bWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVHZW9tZXRyeUZvckxpbmVDb250ZW50KToKKyAgICAgICAg KiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6TGluZUJveDo6YWRkSW5saW5lTGV2ZWxCb3gpOgorICAgICAgICAqIGxh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaDoKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6TGluZUJveDo6aGFzSW5saW5lQm94IGNvbnN0KToKKwogMjAyMC0xMi0xOSAgWmFs YW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0ludGVncmF0aW9u XSBSZW1vdmUgcmVkdW5kYW50IElubGluZUNvbnRlbnQ6OklubGluZUJveApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0Nv bnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQuY3BwCmluZGV4IDkwNWY5NmMzMDkxOTIzYjJiM2MyYjU1NjY0YWU2 YTI0NzU0Y2Q1NzIuLmUzNGVlODQ5NzQyODM1Y2RmMTBhMDc0ZjA5YTQzNjEwMThlNzZkNGQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTQxMyw2MyArNDEzLDc5IEBA IElubGluZVJlY3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVHZW9tZXRyeUZvckxp bmVDb250ZW50KGNvbnN0IExpbmVCdWlsCiAKICAgICBmb3JtYXR0aW5nU3RhdGUuYWRkTGluZUJv eChnZW9tZXRyeS5saW5lQm94Rm9yTGluZUNvbnRlbnQobGluZUNvbnRlbnQpKTsKICAgICBjb25z dCBhdXRvJiBsaW5lQm94ID0gZm9ybWF0dGluZ1N0YXRlLmxpbmVCb3hlcygpLmxhc3QoKTsKKyAg ICBhdXRvIGxpbmVJbmRleCA9IGZvcm1hdHRpbmdTdGF0ZS5saW5lcygpLnNpemUoKTsKICAgICBh dXRvJiBsaW5lQm94TG9naWNhbFJlY3QgPSBsaW5lQm94LmxvZ2ljYWxSZWN0KCk7CiAgICAgSGFz aFNldDxjb25zdCBCb3gqPiBpbmxpbmVCb3hTdGFydFNldDsKICAgICBIYXNoU2V0PGNvbnN0IEJv eCo+IGlubGluZUJveEVuZFNldDsKIAotICAgIGF1dG8gY29uc3RydWN0TGluZVJ1bnMgPSBbJl0g ewotICAgICAgICBhdXRvIGxpbmVJbmRleCA9IGZvcm1hdHRpbmdTdGF0ZS5saW5lcygpLnNpemUo KTsKKyAgICBhdXRvIGNvbnN0cnVjdExpbmVSdW5zQW5kVXBkYXRlQm94R2VvbWV0cnkgPSBbJl0g ewogICAgICAgICAvLyBDcmVhdGUgdGhlIGlubGluZSBydW5zIG9uIHRoZSBjdXJyZW50IGxpbmUu IFRoaXMgaXMgbW9zdGx5IHRleHQgYW5kIGF0b21pYyBpbmxpbmUgcnVucy4KICAgICAgICAgZm9y bWF0dGluZ1N0YXRlLmxpbmVSdW5zKCkucmVzZXJ2ZUNhcGFjaXR5KGxpbmVDb250ZW50LnJ1bnMu c2l6ZSgpKTsKICAgICAgICAgZm9yIChhdXRvJiBsaW5lUnVuIDogbGluZUNvbnRlbnQucnVucykg ewogICAgICAgICAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBub3QgbmVlZCB0byBjb25zdHJ1Y3Qg YSBsaW5lIHJ1biBmb3IgPGJyPi4KICAgICAgICAgICAgIGF1dG8mIGxheW91dEJveCA9IGxpbmVS dW4ubGF5b3V0Qm94KCk7Ci0gICAgICAgICAgICBpZiAobGluZVJ1bi5pc1RleHQoKSB8fCBsaW5l UnVuLmlzTGluZUJyZWFrKCkpCi0gICAgICAgICAgICAgICAgZm9ybWF0dGluZ1N0YXRlLmFkZExp bmVSdW4oeyBsaW5lSW5kZXgsIGxpbmVSdW4ubGF5b3V0Qm94KCksIGxpbmVCb3gubG9naWNhbFJl Y3RGb3JUZXh0UnVuKGxpbmVSdW4pLCBsaW5lUnVuLmV4cGFuc2lvbigpLCBsaW5lUnVuLnRleHRD b250ZW50KCkgfSk7Ci0gICAgICAgICAgICBlbHNlIGlmIChsaW5lUnVuLmlzQm94KCkgfHwgbGlu ZVJ1bi5pc0lubGluZUJveFN0YXJ0KCkpIHsKKyAgICAgICAgICAgIGlmIChsaW5lUnVuLmlzVGV4 dCgpKSB7CisgICAgICAgICAgICAgICAgZm9ybWF0dGluZ1N0YXRlLmFkZExpbmVSdW4oeyBsaW5l SW5kZXgsIGxheW91dEJveCwgbGluZUJveC5sb2dpY2FsUmVjdEZvclRleHRSdW4obGluZVJ1biks IGxpbmVSdW4uZXhwYW5zaW9uKCksIGxpbmVSdW4udGV4dENvbnRlbnQoKSB9KTsKKyAgICAgICAg ICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGlmIChsaW5lUnVu LmlzTGluZUJyZWFrKCkpIHsKKyAgICAgICAgICAgICAgICBhdXRvIGxpbmVCcmVha0JveFJlY3Qg PSBsaW5lQm94LmxvZ2ljYWxSZWN0Rm9yVGV4dFJ1bihsaW5lUnVuKTsKKyAgICAgICAgICAgICAg ICBmb3JtYXR0aW5nU3RhdGUuYWRkTGluZVJ1bih7IGxpbmVJbmRleCwgbGF5b3V0Qm94LCBsaW5l QnJlYWtCb3hSZWN0LCBsaW5lUnVuLmV4cGFuc2lvbigpLCBsaW5lUnVuLnRleHRDb250ZW50KCkg fSk7CisKKyAgICAgICAgICAgICAgICBpZiAobGF5b3V0Qm94LmlzTGluZUJyZWFrQm94KCkpIHsK KyAgICAgICAgICAgICAgICAgICAgLy8gT25seSBoYXJkIGxpbmVicmVha3MgaGF2ZSBhc3NvY2lh dGVkIGxheW91dCBib3hlcy4KKyAgICAgICAgICAgICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkg PSBmb3JtYXR0aW5nU3RhdGUuYm94R2VvbWV0cnkobGF5b3V0Qm94KTsKKyAgICAgICAgICAgICAg ICAgICAgbGluZUJyZWFrQm94UmVjdC5tb3ZlQnkobGluZUJveExvZ2ljYWxSZWN0LnRvcExlZnQo KSk7CisgICAgICAgICAgICAgICAgICAgIGJveEdlb21ldHJ5LnNldExvZ2ljYWxUb3BMZWZ0KHRv TGF5b3V0UG9pbnQobGluZUJyZWFrQm94UmVjdC50b3BMZWZ0KCkpKTsKKyAgICAgICAgICAgICAg ICAgICAgYm94R2VvbWV0cnkuc2V0Q29udGVudEJveEhlaWdodCh0b0xheW91dFVuaXQobGluZUJy ZWFrQm94UmVjdC5oZWlnaHQoKSkpOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAg ICBjb250aW51ZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGlmIChsaW5lUnVuLmlzQm94 KCkpIHsKKyAgICAgICAgICAgICAgICBBU1NFUlQobGF5b3V0Qm94LmlzQXRvbWljSW5saW5lTGV2 ZWxCb3goKSk7CiAgICAgICAgICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0aW5n U3RhdGUuYm94R2VvbWV0cnkobGF5b3V0Qm94KTsKLSAgICAgICAgICAgICAgICBmb3JtYXR0aW5n U3RhdGUuYWRkTGluZVJ1bih7IGxpbmVJbmRleCwgbGluZVJ1bi5sYXlvdXRCb3goKSwgbGluZUJv eC5sb2dpY2FsTWFyZ2luUmVjdEZvcklubGluZUxldmVsQm94KGxpbmVSdW4ubGF5b3V0Qm94KCks IGJveEdlb21ldHJ5KSwgbGluZVJ1bi5leHBhbnNpb24oKSwgeyB9IH0pOwotICAgICAgICAgICAg ICAgIGlmIChsaW5lUnVuLmlzSW5saW5lQm94U3RhcnQoKSkKLSAgICAgICAgICAgICAgICAgICAg aW5saW5lQm94U3RhcnRTZXQuYWRkKCZsYXlvdXRCb3gpOwotICAgICAgICAgICAgfSBlbHNlIGlm IChsaW5lUnVuLmlzSW5saW5lQm94RW5kKCkpCisgICAgICAgICAgICAgICAgYXV0byBsb2dpY2Fs TWFyZ2luUmVjdCA9IGxpbmVCb3gubG9naWNhbE1hcmdpblJlY3RGb3JJbmxpbmVMZXZlbEJveChs YXlvdXRCb3gsIGJveEdlb21ldHJ5KTsKKyAgICAgICAgICAgICAgICBmb3JtYXR0aW5nU3RhdGUu YWRkTGluZVJ1bih7IGxpbmVJbmRleCwgbGF5b3V0Qm94LCBsb2dpY2FsTWFyZ2luUmVjdCwgbGlu ZVJ1bi5leHBhbnNpb24oKSwgeyB9IH0pOworCisgICAgICAgICAgICAgICAgYXV0byBib3JkZXJC b3hMb2dpY2FsVG9wTGVmdCA9IGxpbmVCb3hMb2dpY2FsUmVjdC50b3BMZWZ0KCk7CisgICAgICAg ICAgICAgICAgYm9yZGVyQm94TG9naWNhbFRvcExlZnQubW92ZShsb2dpY2FsTWFyZ2luUmVjdC5s ZWZ0KCkgKyBib3hHZW9tZXRyeS5tYXJnaW5TdGFydCgpLCBsb2dpY2FsTWFyZ2luUmVjdC50b3Ao KSArIGJveEdlb21ldHJ5Lm1hcmdpbkJlZm9yZSgpKTsKKyAgICAgICAgICAgICAgICBpZiAobGF5 b3V0Qm94LmlzSW5GbG93UG9zaXRpb25lZCgpKQorICAgICAgICAgICAgICAgICAgICBib3JkZXJC b3hMb2dpY2FsVG9wTGVmdCArPSBnZW9tZXRyeS5pbkZsb3dQb3NpdGlvbmVkUG9zaXRpb25PZmZz ZXQobGF5b3V0Qm94LCBob3Jpem9udGFsQ29uc3RyYWludHMpOworICAgICAgICAgICAgICAgIC8v IEF0b21pYyBpbmxpbmUgYm94ZXMgYXJlIGFsbCBzZXQuIFRoZWlyIG1hcmdpbi9ib3JkZXIvY29u dGVudCBib3ggZ2VvbWV0cmllcyBhcmUgYWxyZWFkeSBjb21wdXRlZC4gV2UganVzdCBoYXZlIHRv IHBvc2l0aW9uIHRoZW0gaGVyZS4KKyAgICAgICAgICAgICAgICBib3hHZW9tZXRyeS5zZXRMb2dp Y2FsVG9wTGVmdCh0b0xheW91dFBvaW50KGJvcmRlckJveExvZ2ljYWxUb3BMZWZ0KSk7CisgICAg ICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBpZiAobGlu ZVJ1bi5pc0lubGluZUJveFN0YXJ0KCkpIHsKKyAgICAgICAgICAgICAgICBhdXRvJiBib3hHZW9t ZXRyeSA9IGZvcm1hdHRpbmdTdGF0ZS5ib3hHZW9tZXRyeShsYXlvdXRCb3gpOworICAgICAgICAg ICAgICAgIGZvcm1hdHRpbmdTdGF0ZS5hZGRMaW5lUnVuKHsgbGluZUluZGV4LCBsYXlvdXRCb3gs IGxpbmVCb3gubG9naWNhbE1hcmdpblJlY3RGb3JJbmxpbmVMZXZlbEJveChsYXlvdXRCb3gsIGJv eEdlb21ldHJ5KSwgbGluZVJ1bi5leHBhbnNpb24oKSwgeyB9IH0pOworICAgICAgICAgICAgICAg IGlubGluZUJveFN0YXJ0U2V0LmFkZCgmbGF5b3V0Qm94KTsKKyAgICAgICAgICAgICAgICBjb250 aW51ZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGlmIChsaW5lUnVuLmlzSW5saW5lQm94 RW5kKCkpIHsKICAgICAgICAgICAgICAgICBpbmxpbmVCb3hFbmRTZXQuYWRkKCZsYXlvdXRCb3gp OwotICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIEFTU0VSVChsaW5lUnVuLmlzV29y ZEJyZWFrT3Bwb3J0dW5pdHkoKSk7CisgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAg ICAgICB9CisgICAgICAgICAgICBBU1NFUlQobGluZVJ1bi5pc1dvcmRCcmVha09wcG9ydHVuaXR5 KCkpOwogICAgICAgICB9CiAgICAgfTsKLSAgICBjb25zdHJ1Y3RMaW5lUnVucygpOworICAgIGNv bnN0cnVjdExpbmVSdW5zQW5kVXBkYXRlQm94R2VvbWV0cnkoKTsKIAotICAgIGF1dG8gdXBkYXRl Qm94R2VvbWV0cnkgPSBbJl0geworICAgIGF1dG8gdXBkYXRlQm94R2VvbWV0cnlGb3JJbmxpbmVC b3hlcyA9IFsmXSB7CisgICAgICAgIC8vIEZJWE1FOiBXZSBtYXkgd2FudCB0byBrZWVwIGFyb3Vu ZCBhbiBpbmxpbmUgYm94IG9ubHkgc2V0LgorICAgICAgICBpZiAoIWxpbmVCb3guaGFzSW5saW5l Qm94KCkpCisgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIC8vIEdyYWIgdGhlIGlubGluZSBi b3hlcyAoZXZlbiB0aG9zZSB0aGF0IGRvbid0IGhhdmUgYXNzb2NpYXRlZCBsYXlvdXQgYm94ZXMg b24gdGhlIGN1cnJlbnQgbGluZSBkdWUgdG8gbGluZSB3cmFwcGluZykKICAgICAgICAgLy8gYW5k IHVwZGF0ZSB0aGVpciBnZW9tZXRyaWVzLgogICAgICAgICBmb3IgKGF1dG8mIGlubGluZUxldmVs Qm94IDogbGluZUJveC5pbmxpbmVMZXZlbEJveExpc3QoKSkgeworICAgICAgICAgICAgaWYgKCFp bmxpbmVMZXZlbEJveC0+aXNJbmxpbmVCb3goKSkKKyAgICAgICAgICAgICAgICBjb250aW51ZTsK ICAgICAgICAgICAgIGF1dG8mIGxheW91dEJveCA9IGlubGluZUxldmVsQm94LT5sYXlvdXRCb3go KTsKICAgICAgICAgICAgIGlmICgmbGF5b3V0Qm94ID09ICZyb290KCkpIHsKICAgICAgICAgICAg ICAgICAvLyBJZ25vcmUgcm9vdCBpbmxpbmUgYm94LgogICAgICAgICAgICAgICAgIGNvbnRpbnVl OwogICAgICAgICAgICAgfQogICAgICAgICAgICAgYXV0byYgYm94R2VvbWV0cnkgPSBmb3JtYXR0 aW5nU3RhdGUuYm94R2VvbWV0cnkobGF5b3V0Qm94KTsKLSAgICAgICAgICAgIGlmIChsYXlvdXRC b3guaXNBdG9taWNJbmxpbmVMZXZlbEJveCgpKSB7Ci0gICAgICAgICAgICAgICAgYXV0byBsb2dp Y2FsTWFyZ2luUmVjdCA9IGxpbmVCb3gubG9naWNhbE1hcmdpblJlY3RGb3JJbmxpbmVMZXZlbEJv eChsYXlvdXRCb3gsIGJveEdlb21ldHJ5KTsKLSAgICAgICAgICAgICAgICBhdXRvIGJvcmRlckJv eExvZ2ljYWxUb3BMZWZ0ID0gbGluZUJveExvZ2ljYWxSZWN0LnRvcExlZnQoKTsKLSAgICAgICAg ICAgICAgICBib3JkZXJCb3hMb2dpY2FsVG9wTGVmdC5tb3ZlKGxvZ2ljYWxNYXJnaW5SZWN0Lmxl ZnQoKSArIGJveEdlb21ldHJ5Lm1hcmdpblN0YXJ0KCksIGxvZ2ljYWxNYXJnaW5SZWN0LnRvcCgp ICsgYm94R2VvbWV0cnkubWFyZ2luQmVmb3JlKCkpOwotCi0gICAgICAgICAgICAgICAgaWYgKGxh eW91dEJveC5pc0luRmxvd1Bvc2l0aW9uZWQoKSkKLSAgICAgICAgICAgICAgICAgICAgYm9yZGVy Qm94TG9naWNhbFRvcExlZnQgKz0gZ2VvbWV0cnkuaW5GbG93UG9zaXRpb25lZFBvc2l0aW9uT2Zm c2V0KGxheW91dEJveCwgaG9yaXpvbnRhbENvbnN0cmFpbnRzKTsKLSAgICAgICAgICAgICAgICAv LyBBdG9taWMgaW5saW5lIGJveGVzIGFyZSBhbGwgc2V0LiBUaGVpciBtYXJnaW4vYm9yZGVyL2Nv bnRlbnQgYm94IGdlb21ldHJpZXMgYXJlIGFscmVhZHkgY29tcHV0ZWQuIFdlIGp1c3QgaGF2ZSB0 byBwb3NpdGlvbiB0aGVtIGhlcmUuCi0gICAgICAgICAgICAgICAgYm94R2VvbWV0cnkuc2V0TG9n aWNhbFRvcExlZnQodG9MYXlvdXRQb2ludChib3JkZXJCb3hMb2dpY2FsVG9wTGVmdCkpOwotICAg ICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgaWYgKGxh eW91dEJveC5pc0xpbmVCcmVha0JveCgpKSB7Ci0gICAgICAgICAgICAgICAgYXV0byBsaW5lQnJl YWtCb3hSZWN0ID0gbGluZUJveC5sb2dpY2FsTWFyZ2luUmVjdEZvcklubGluZUxldmVsQm94KGxh eW91dEJveCwgYm94R2VvbWV0cnkpOwotICAgICAgICAgICAgICAgIGxpbmVCcmVha0JveFJlY3Qu bW92ZUJ5KGxpbmVCb3hMb2dpY2FsUmVjdC50b3BMZWZ0KCkpOwotICAgICAgICAgICAgICAgIGJv eEdlb21ldHJ5LnNldExvZ2ljYWxUb3BMZWZ0KHRvTGF5b3V0UG9pbnQobGluZUJyZWFrQm94UmVj dC50b3BMZWZ0KCkpKTsKLSAgICAgICAgICAgICAgICBib3hHZW9tZXRyeS5zZXRDb250ZW50Qm94 SGVpZ2h0KHRvTGF5b3V0VW5pdChsaW5lQnJlYWtCb3hSZWN0LmhlaWdodCgpKSk7Ci0gICAgICAg ICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBBU1NFUlQobGF5 b3V0Qm94LmlzSW5saW5lQm94KCkpOwogICAgICAgICAgICAgLy8gSW5saW5lIGJveGVzIG1heSBv ciBtYXkgbm90IGJlIHdyYXBwZWQgYW5kIGhhdmUgcnVucyBvbiBtdWx0aXBsZSBsaW5lcyAoZS5n LiA8c3Bhbj5maXJzdCBsaW5lPGJyPnNlY29uZCBsaW5lPGJyPnRoaXJkIGxpbmU8L3NwYW4+KQot ICAgICAgICAgICAgLy8gSW5saW5lIGJveCBjb29yZGluYXRlcyBhcmUgcmVsYXRpdmUgdG8gdGhl IGxpbmUgYm94LiBMZXQncyBjb252ZXJ0IHRvcC9sZWZ0IHJlbGF0aXZlIHRvIHRoZSBmb3JtYXR0 aW5nIGNvbnRleHQgcm9vdC4KICAgICAgICAgICAgIGF1dG8gaW5saW5lQm94TWFyZ2luUmVjdCA9 IGxpbmVCb3gubG9naWNhbE1hcmdpblJlY3RGb3JJbmxpbmVMZXZlbEJveChsYXlvdXRCb3gsIGJv eEdlb21ldHJ5KTsKICAgICAgICAgICAgIGF1dG8gbG9naWNhbFJlY3QgPSBSZWN0IHsgTGF5b3V0 UG9pbnQgeyBpbmxpbmVCb3hNYXJnaW5SZWN0LnRvcExlZnQoKSB9LCBMYXlvdXRTaXplIHsgaW5s aW5lQm94TWFyZ2luUmVjdC5zaXplKCkgfSB9OwogICAgICAgICAgICAgbG9naWNhbFJlY3QubW92 ZUJ5KExheW91dFBvaW50IHsgbGluZUJveExvZ2ljYWxSZWN0LnRvcExlZnQoKSB9KTsKQEAgLTQ5 OCw3ICs1MTQsNyBAQCBJbmxpbmVSZWN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRl R2VvbWV0cnlGb3JMaW5lQ29udGVudChjb25zdCBMaW5lQnVpbAogICAgICAgICAgICAgYm94R2Vv bWV0cnkuc2V0Q29udGVudEJveFdpZHRoKGVuY2xvc2luZ1JlY3Qud2lkdGgoKSk7CiAgICAgICAg IH0KICAgICB9OwotICAgIHVwZGF0ZUJveEdlb21ldHJ5KCk7CisgICAgdXBkYXRlQm94R2VvbWV0 cnlGb3JJbmxpbmVCb3hlcygpOwogCiAgICAgYXV0byBjb25zdHJ1Y3RMaW5lR2VvbWV0cnkgPSBb Jl0gewogICAgICAgICBmb3JtYXR0aW5nU3RhdGUuYWRkTGluZSh7IGxpbmVCb3hMb2dpY2FsUmVj dCwgbGluZUJveC5hbGlnbm1lbnRCYXNlbGluZSgpLCBsaW5lQm94Lmhvcml6b250YWxBbGlnbm1l bnRPZmZzZXQoKS52YWx1ZU9yKElubGluZUxheW91dFVuaXQgeyB9KSwgbGluZUNvbnRlbnQuY29u dGVudExvZ2ljYWxXaWR0aCB9KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHAKaW5kZXggYTg3YjUxNDcyY2Y3ZjU4 MmVmOWY0N2M1NTU2NTg0NjE3NzU0N2Y5OS4uZjU4NGRjYWQ2NzRmYjJmMmYyZWMxZTg2ZDU2MzQz NGJhNjg2NWI2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lTGluZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5jcHAKQEAgLTkyLDYgKzkyLDcgQEAgdm9pZCBMaW5l Qm94OjphZGRSb290SW5saW5lQm94KHN0ZDo6dW5pcXVlX3B0cjxJbmxpbmVMZXZlbEJveD4mJiBy b290SW5saW5lQm94KQogCiB2b2lkIExpbmVCb3g6OmFkZElubGluZUxldmVsQm94KHN0ZDo6dW5p cXVlX3B0cjxJbmxpbmVMZXZlbEJveD4mJiBpbmxpbmVMZXZlbEJveCkKIHsKKyAgICBtX2hhc0lu bGluZUJveCA9IG1faGFzSW5saW5lQm94IHx8IGlubGluZUxldmVsQm94LT5pc0lubGluZUJveCgp OwogICAgIG1faW5saW5lTGV2ZWxCb3hSZWN0TWFwLnNldCgmaW5saW5lTGV2ZWxCb3gtPmxheW91 dEJveCgpLCBpbmxpbmVMZXZlbEJveC5nZXQoKSk7CiAgICAgbV9ub25Sb290SW5saW5lTGV2ZWxC b3hMaXN0LmFwcGVuZChXVEZNb3ZlKGlubGluZUxldmVsQm94KSk7CiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmggYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQm94LmgKaW5k ZXggMjJlY2VhZTE0ZTBiNjE2ZGUxNzJmMWJkYjJhN2Y2MzM5MTFmNmE3ZC4uMzFmZDE0YjRkMmE3 NDFjNmJkNGYxNTk0OWI0M2U0NjNiYjI4ODIzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJveC5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCb3guaApAQCAtMTM5LDYgKzEz OSw3IEBAIHB1YmxpYzoKIAogICAgIE9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IGhvcml6b250 YWxBbGlnbm1lbnRPZmZzZXQoKSBjb25zdCB7IHJldHVybiBtX2hvcml6b250YWxBbGlnbm1lbnRP ZmZzZXQ7IH0KICAgICBib29sIGlzQ29uc2lkZXJlZEVtcHR5KCkgY29uc3QgeyByZXR1cm4gbV9p c0NvbnNpZGVyZWRFbXB0eTsgfQorICAgIGJvb2wgaGFzSW5saW5lQm94KCkgY29uc3QgeyByZXR1 cm4gbV9oYXNJbmxpbmVCb3g7IH0KIAogICAgIGNvbnN0IElubGluZUxldmVsQm94JiBpbmxpbmVM ZXZlbEJveEZvckxheW91dEJveChjb25zdCBCb3gmIGxheW91dEJveCkgY29uc3QgeyByZXR1cm4g Km1faW5saW5lTGV2ZWxCb3hSZWN0TWFwLmdldCgmbGF5b3V0Qm94KTsgfQogCkBAIC0xNzEsNiAr MTcyLDcgQEAgcHJpdmF0ZToKICAgICBJbmxpbmVSZWN0IG1fbG9naWNhbFJlY3Q7CiAgICAgT3B0 aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gbV9ob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0OwogICAg IGJvb2wgbV9pc0NvbnNpZGVyZWRFbXB0eSB7IHRydWUgfTsKKyAgICBib29sIG1faGFzSW5saW5l Qm94IHsgZmFsc2UgfTsKIAogICAgIHN0ZDo6dW5pcXVlX3B0cjxJbmxpbmVMZXZlbEJveD4gbV9y b290SW5saW5lQm94OwogICAgIElubGluZUxldmVsQm94TGlzdCBtX25vblJvb3RJbmxpbmVMZXZl bEJveExpc3Q7Cg==