218271 2020-10-27 18:55:01 -0700 [LFC][IFC] Add support for case when nested vertical alignment affects the root inlinebox vertical position 2020-10-28 06:15:25 -0700 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 1702197 0 zalan 2020-10-27 18:55:01 -0700 ssia 1702201 1 412497 zalan 2020-10-27 19:09:53 -0700 Created attachment 412497 Patch 1702289 2 ews-feeder 2020-10-28 06:14:53 -0700 Committed r269102: <https://trac.webkit.org/changeset/269102> All reviewed patches have been landed. Closing bug and clearing flags on attachment 412497. 1702290 3 webkit-bug-importer 2020-10-28 06:15:25 -0700 <rdar://problem/70762074> 412497 2020-10-27 19:09:53 -0700 2020-10-28 06:14:53 -0700 Patch bug-218271-20201027190952.patch text/plain 12573 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5MDU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjFiM2Q4YTFjNzdjOTM3 OTEzYjFjYmRmMmZmNTgyN2NjYTM5YTMzNi4uY2NkNGNiMWViNTVhYmY4MDc0Nzc5YmY2MmQxZGU0 NWY0MDZhYjk5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIwLTEwLTI3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBZGQgc3Vw cG9ydCBmb3IgY2FzZSB3aGVuIG5lc3RlZCB2ZXJ0aWNhbCBhbGlnbm1lbnQgYWZmZWN0cyB0aGUg cm9vdCBpbmxpbmVib3ggdmVydGljYWwgcG9zaXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxODI3MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIExldCdzIHN0YXJ0IHRyYWNraW5nIHRoZSBuZXN0ZWQg dmVydGljYWwgYWxpZ25tZW50IG9mZnNldHMgZnJvbSB0aGUgcm9vdCdzIGJhc2VsaW5lLgorICAg ICAgICBJdCBlbmFibGVzIHVzIHRvIGZpbmQgb3V0IGhvdyBtdWNoIG9mZnNldCB0aGUgcm9vdCBp bmxpbmVib3gncyBiYXNlbGluZSBpcyByZXF1aXJlZCBpbnNpZGUgdGhlIGxpbmUgYm94LgorICAg ICAgICBlLmcuCisgICAgICAgIDxkaXYgc3R5bGU9ImZvbnQtc2l6ZTogNTBweDsiPgorICAgICAg ICAgIHJvb3QgaW5saW5lYm94IHRleHQgY29udGVudAorICAgICAgICAgIDxzcGFuIHN0eWxlPSJm b250LXNpemU6IDEwcHg7IHZlcnRpY2FsLWFsaWduOiB0ZXh0LWJvdHRvbSI+YW5kIHNvbWUgbmVz dGVkIHRleHQgd2l0aCBhbiBpbWFnZQorICAgICAgICAgICAgPGltZyBzcmM9ImJyb2tlbi5qcGci IHN0eWxlPSJ2ZXJ0aWNhbC1hbGlnbjogYmFzZWxpbmU7IGhlaWdodDogMTAwcHg7IHdpZHRoOiAx MDBweDsiPgorICAgICAgICAgIDwvc3Bhbj4KKyAgICAgICAgPC9kaXY+CisgICAgICAgIEluIHRo aXMgY2FzZSwgdGhlIG5lc3RlZCBpbmxpbmUgYm94ICg8c3Bhbj4pIGhhcyAndGV4dC1ib3R0b20n IHZlcnRpY2FsIGFsaWdubWVudCB3aGljaCBtYXkgc3RyZXRjaCB0aGUgbGluZSBib3ggYW5kCisg ICAgICAgIG1heSBwdXNoIHRoZSByb290IGlubGluZWJveCBkb3dud2FyZHMgc28gYXMgdGhlIG5l c3RlZCA8aW1nPiAoYWxpZ25lZCB3aXRoIHRoZSA8c3Bhbj4ncyBiYXNlbGluZSkuCisKKyAgICAg ICAgV2Ugc2ltcGx5IGNvbXB1dGUgdGhlIGFic29sdXRlIG9mZnNldCB2YWx1ZSBmb3IgZWFjaCBp bmxpbmUgbGV2ZWwgYm94ZXMgYXMgd2Ugd2FsayB0aGUgInRyZWUiIGFuZCBob2xkIG9uIHRvIHRo ZSBtYXhpbXVtIHZhbHVlLgorCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkxpbmVCb3hCdWlsZGVyOjphbGlnbklubGluZUxldmVsQm94ZXNWZXJ0aWNhbGx5QW5kQ29t cHV0ZUxpbmVCb3hIZWlnaHQpOgorCiAyMDIwLTEwLTI3ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBh cHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBBZGQgc3VwcG9ydCBmb3IgdmVydGljYWwt YWxpZ246IC13ZWJraXQtYmFzZWxpbmUtbWlkZGxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1h dHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IDJkNDFhZGUyYmM0YjMxZGY4ZTQ2NDZlNWE3 Yjk5OTVhMDIyMzJmZjAuLjU1ZDczNDhhM2IyNjY5MTQxZWIyYmU3ZTc4MDMwYmZkMjhhN2JjZTkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGlu ZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCkBA IC0zMDMsMTUgKzMwMywxNiBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjphbGlnbklubGluZUxldmVs Qm94ZXNWZXJ0aWNhbGx5QW5kQ29tcHV0ZUxpbmVCb3hIZWlnaHQoTGluZQogICAgIC8vIGh0dHBz Oi8vd3d3LnczLm9yZy9UUi9jc3MtaW5saW5lLTMvI2xpbmUtbGF5b3V0CiAgICAgYXV0byBxdWly a3MgPSBmb3JtYXR0aW5nQ29udGV4dCgpLnF1aXJrcygpOwogICAgIFZlY3RvcjxMaW5lQm94OjpJ bmxpbmVMZXZlbEJveCo+IGxpbmVCb3hSZWxhdGl2ZUlubGluZUxldmVsQm94ZXM7Ci0gICAgc3Ry dWN0IEFic29sdXRlVG9wQW5kQm90dG9tIHsKKyAgICBzdHJ1Y3QgQWJzb2x1dGVHZW9tZXRyeSB7 CiAgICAgICAgIElubGluZUxheW91dFVuaXQgdG9wIHsgMCB9OwogICAgICAgICBJbmxpbmVMYXlv dXRVbml0IGJvdHRvbSB7IDAgfTsKKyAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBiYXNlbGluZU9m ZnNldEZyb21Sb290SW5saW5lQm94QmFzZWxpbmUgeyAwIH07CiAgICAgICAgIGNvbnN0IExpbmVC b3g6OklubGluZUxldmVsQm94KiBpbmxpbmVMZXZlbEJveCB7IG51bGxwdHIgfTsKICAgICB9Owot ICAgIEhhc2hNYXA8TGluZUJveDo6SW5saW5lTGV2ZWxCb3gqLCBBYnNvbHV0ZVRvcEFuZEJvdHRv bT4gYWJzb2x1dGVMb2dpY2FsVG9wQW5kQm90dG9tTWFwOworICAgIEhhc2hNYXA8TGluZUJveDo6 SW5saW5lTGV2ZWxCb3gqLCBBYnNvbHV0ZUdlb21ldHJ5PiBpbmxpbmVMZXZlbEJveEFic29sdXRl R2VvbWV0cnlNYXA7CiAgICAgYXV0byYgcm9vdElubGluZUJveCA9IGxpbmVCb3gucm9vdElubGlu ZUJveCgpOwotICAgIGFic29sdXRlTG9naWNhbFRvcEFuZEJvdHRvbU1hcC5hZGQoJnJvb3RJbmxp bmVCb3gsIEFic29sdXRlVG9wQW5kQm90dG9tIHsgeyB9LCByb290SW5saW5lQm94LmxheW91dEJv dW5kcygpLmhlaWdodCgpLCAmcm9vdElubGluZUJveCB9KTsKLSAgICBhdXRvIG1heGltdW1PZmZz ZXRGcm9tUm9vdElubGluZUJveEJhc2VsaW5lID0gcm9vdElubGluZUJveC5pc0VtcHR5KCkgPyBJ bmxpbmVMYXlvdXRVbml0KCkgOiByb290SW5saW5lQm94LmxheW91dEJvdW5kcygpLmFzY2VudDsK KyAgICBpbmxpbmVMZXZlbEJveEFic29sdXRlR2VvbWV0cnlNYXAuYWRkKCZyb290SW5saW5lQm94 LCBBYnNvbHV0ZUdlb21ldHJ5IHsgeyB9LCByb290SW5saW5lQm94LmxheW91dEJvdW5kcygpLmhl aWdodCgpLCB7IH0sICZyb290SW5saW5lQm94IH0pOworICAgIGF1dG8gbWF4aW11bVRvcE9mZnNl dEZyb21Sb290SW5saW5lQm94QmFzZWxpbmUgPSByb290SW5saW5lQm94LmlzRW1wdHkoKSA/IElu bGluZUxheW91dFVuaXQoKSA6IHJvb3RJbmxpbmVCb3gubGF5b3V0Qm91bmRzKCkuYXNjZW50Owog CiAgICAgYXV0byBhbGlnbklubGluZUJveFJlbGF0aXZlSW5saW5lTGV2ZWxCb3hlcyA9IFsmXSB7 CiAgICAgICAgIC8vIEZJWE1FOiBBZGQgcHJvcGVyIHN1cHBvcnQgZm9yIGNhc2VzIHdoZW4gdGhl IGlubGluZSBib3ggd2l0aCBsaW5lIGJveCByZWxhdGl2ZSBhbGlnbm1lbnQgaGFzIGEgY2hpbGQg aW5saW5lIGJveApAQCAtMzI0LDE4ICszMjUsMTggQEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6YWxp Z25JbmxpbmVMZXZlbEJveGVzVmVydGljYWxseUFuZENvbXB1dGVMaW5lQm94SGVpZ2h0KExpbmUK ICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGF1dG8mIHBhcmVudElubGluZUJveCA9IGxpbmVC b3guaW5saW5lTGV2ZWxCb3hGb3JMYXlvdXRCb3gobGF5b3V0Qm94LnBhcmVudCgpKTsKICAgICAg ICAgICAgIGF1dG8gbG9naWNhbFRvcCA9IElubGluZUxheW91dFVuaXQgeyB9OwotICAgICAgICAg ICAgYXV0byBvZmZzZXRGcm9tUGFyZW50SW5saW5lQm94QmFzZWxpbmUgPSBJbmxpbmVMYXlvdXRV bml0IHsgfTsKKyAgICAgICAgICAgIGF1dG8gYmFzZWxpbmVPZmZzZXRGcm9tUGFyZW50QmFzZWxp bmUgPSBJbmxpbmVMYXlvdXRVbml0IHsgfTsKICAgICAgICAgICAgIHN3aXRjaCAoaW5saW5lTGV2 ZWxCb3gtPnZlcnRpY2FsQWxpZ24oKSkgewogICAgICAgICAgICAgY2FzZSBWZXJ0aWNhbEFsaWdu OjpCYXNlbGluZToKLSAgICAgICAgICAgICAgICBvZmZzZXRGcm9tUGFyZW50SW5saW5lQm94QmFz ZWxpbmUgPSBpbmxpbmVMZXZlbEJveC0+bGF5b3V0Qm91bmRzKCkuYXNjZW50OwotICAgICAgICAg ICAgICAgIGxvZ2ljYWxUb3AgPSBwYXJlbnRJbmxpbmVCb3guYmFzZWxpbmUoKSAtIG9mZnNldEZy b21QYXJlbnRJbmxpbmVCb3hCYXNlbGluZTsKKyAgICAgICAgICAgICAgICBsb2dpY2FsVG9wID0g cGFyZW50SW5saW5lQm94LmJhc2VsaW5lKCkgLSBpbmxpbmVMZXZlbEJveC0+bGF5b3V0Qm91bmRz KCkuYXNjZW50OworICAgICAgICAgICAgICAgIGJhc2VsaW5lT2Zmc2V0RnJvbVBhcmVudEJhc2Vs aW5lID0geyB9OwogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgY2FzZSBWZXJ0 aWNhbEFsaWduOjpUZXh0VG9wOiB7CiAgICAgICAgICAgICAgICAgLy8gTm90ZSB0aGF0IFRleHRU b3AgYWxpZ25zIHdpdGggdGhlIGlubGluZSBib3gncyBmb250IG1ldHJpY3MgdG9wIChhc2NlbnQp IGFuZCBub3QgdGhlIGxheW91dCBib3VuZHMgdG9wLgogICAgICAgICAgICAgICAgIGF1dG8gcGFy ZW50QXNjZW50ID0gcGFyZW50SW5saW5lQm94LmZvbnRNZXRyaWNzKCkuYXNjZW50KCk7CiAgICAg ICAgICAgICAgICAgYXV0byBwYXJlbnRJbmxpbmVCb3hMb2dpY2FsVG9wID0gcGFyZW50SW5saW5l Qm94LmxheW91dEJvdW5kcygpLmFzY2VudCAtIHBhcmVudEFzY2VudDsKICAgICAgICAgICAgICAg ICBsb2dpY2FsVG9wID0gcGFyZW50SW5saW5lQm94TG9naWNhbFRvcDsKLSAgICAgICAgICAgICAg ICBvZmZzZXRGcm9tUGFyZW50SW5saW5lQm94QmFzZWxpbmUgPSBwYXJlbnRBc2NlbnQ7CisgICAg ICAgICAgICAgICAgYmFzZWxpbmVPZmZzZXRGcm9tUGFyZW50QmFzZWxpbmUgPSBwYXJlbnRBc2Nl bnQgLSBpbmxpbmVMZXZlbEJveC0+bGF5b3V0Qm91bmRzKCkuYXNjZW50OwogICAgICAgICAgICAg ICAgIGJyZWFrOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgY2FzZSBWZXJ0aWNhbEFsaWdu OjpUZXh0Qm90dG9tOiB7CkBAIC0zNDMsMjIgKzM0NCwyOCBAQCB2b2lkIExpbmVCb3hCdWlsZGVy OjphbGlnbklubGluZUxldmVsQm94ZXNWZXJ0aWNhbGx5QW5kQ29tcHV0ZUxpbmVCb3hIZWlnaHQo TGluZQogICAgICAgICAgICAgICAgIGF1dG8mIHBhcmVudEZvbnRNZXRyaWNzID0gcGFyZW50SW5s aW5lQm94LmZvbnRNZXRyaWNzKCk7CiAgICAgICAgICAgICAgICAgYXV0byBwYXJlbnRJbmxpbmVC b3hMYXlvdXRCb3VuZHMgPSBwYXJlbnRJbmxpbmVCb3gubGF5b3V0Qm91bmRzKCk7CiAgICAgICAg ICAgICAgICAgYXV0byBwYXJlbnRJbmxpbmVCb3hMb2dpY2FsQm90dG9tID0gcGFyZW50SW5saW5l Qm94TGF5b3V0Qm91bmRzLmhlaWdodCgpIC0gcGFyZW50SW5saW5lQm94TGF5b3V0Qm91bmRzLmRl c2NlbnQgKyBwYXJlbnRGb250TWV0cmljcy5kZXNjZW50KCk7Ci0gICAgICAgICAgICAgICAgbG9n aWNhbFRvcCA9IHBhcmVudElubGluZUJveExvZ2ljYWxCb3R0b20gLSBpbmxpbmVMZXZlbEJveC0+ bG9naWNhbEhlaWdodCgpOwotICAgICAgICAgICAgICAgIG9mZnNldEZyb21QYXJlbnRJbmxpbmVC b3hCYXNlbGluZSA9IGlubGluZUxldmVsQm94LT5sb2dpY2FsSGVpZ2h0KCkgLSBwYXJlbnRGb250 TWV0cmljcy5kZXNjZW50KCk7CisgICAgICAgICAgICAgICAgYXV0byBsYXlvdXRCb3VuZHMgPSBp bmxpbmVMZXZlbEJveC0+bGF5b3V0Qm91bmRzKCk7CisgICAgICAgICAgICAgICAgbG9naWNhbFRv cCA9IHBhcmVudElubGluZUJveExvZ2ljYWxCb3R0b20gLSBsYXlvdXRCb3VuZHMuaGVpZ2h0KCk7 CisgICAgICAgICAgICAgICAgYmFzZWxpbmVPZmZzZXRGcm9tUGFyZW50QmFzZWxpbmUgPSBsYXlv dXRCb3VuZHMuZGVzY2VudCAtIHBhcmVudEZvbnRNZXRyaWNzLmRlc2NlbnQoKTsKICAgICAgICAg ICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGNhc2UgVmVydGljYWxB bGlnbjo6TWlkZGxlOgotICAgICAgICAgICAgICAgIG9mZnNldEZyb21QYXJlbnRJbmxpbmVCb3hC YXNlbGluZSA9IChpbmxpbmVMZXZlbEJveC0+bGF5b3V0Qm91bmRzKCkuaGVpZ2h0KCkgLyAyICsg cGFyZW50SW5saW5lQm94LmZvbnRNZXRyaWNzKCkueEhlaWdodCgpIC8gMik7Ci0gICAgICAgICAg ICAgICAgbG9naWNhbFRvcCA9IHBhcmVudElubGluZUJveC5iYXNlbGluZSgpIC0gb2Zmc2V0RnJv bVBhcmVudElubGluZUJveEJhc2VsaW5lOworICAgICAgICAgICAgY2FzZSBWZXJ0aWNhbEFsaWdu OjpNaWRkbGU6IHsKKyAgICAgICAgICAgICAgICBhdXRvIGxvZ2ljYWxUb3BPZmZzZXRGcm9tUGFy ZW50QmFzZWxpbmUgPSBpbmxpbmVMZXZlbEJveC0+bGF5b3V0Qm91bmRzKCkuaGVpZ2h0KCkgLyAy ICsgcGFyZW50SW5saW5lQm94LmZvbnRNZXRyaWNzKCkueEhlaWdodCgpIC8gMjsKKyAgICAgICAg ICAgICAgICBsb2dpY2FsVG9wID0gcGFyZW50SW5saW5lQm94LmJhc2VsaW5lKCkgLSBsb2dpY2Fs VG9wT2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5lOworICAgICAgICAgICAgICAgIGJhc2VsaW5lT2Zm c2V0RnJvbVBhcmVudEJhc2VsaW5lID0gbG9naWNhbFRvcE9mZnNldEZyb21QYXJlbnRCYXNlbGlu ZSAtIGlubGluZUxldmVsQm94LT5sYXlvdXRCb3VuZHMoKS5hc2NlbnQ7CiAgICAgICAgICAgICAg ICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIFZlcnRpY2FsQWxpZ246OkJhc2VsaW5lTWlkZGxl OgotICAgICAgICAgICAgICAgIG9mZnNldEZyb21QYXJlbnRJbmxpbmVCb3hCYXNlbGluZSA9IGlu bGluZUxldmVsQm94LT5sYXlvdXRCb3VuZHMoKS5oZWlnaHQoKSAvIDI7Ci0gICAgICAgICAgICAg ICAgbG9naWNhbFRvcCA9IHBhcmVudElubGluZUJveC5iYXNlbGluZSgpIC0gb2Zmc2V0RnJvbVBh cmVudElubGluZUJveEJhc2VsaW5lOworICAgICAgICAgICAgfQorICAgICAgICAgICAgY2FzZSBW ZXJ0aWNhbEFsaWduOjpCYXNlbGluZU1pZGRsZTogeworICAgICAgICAgICAgICAgIGF1dG8gbG9n aWNhbFRvcE9mZnNldEZyb21QYXJlbnRCYXNlbGluZSA9IGlubGluZUxldmVsQm94LT5sYXlvdXRC b3VuZHMoKS5oZWlnaHQoKSAvIDI7CisgICAgICAgICAgICAgICAgbG9naWNhbFRvcCA9IHBhcmVu dElubGluZUJveC5iYXNlbGluZSgpIC0gbG9naWNhbFRvcE9mZnNldEZyb21QYXJlbnRCYXNlbGlu ZTsKKyAgICAgICAgICAgICAgICBiYXNlbGluZU9mZnNldEZyb21QYXJlbnRCYXNlbGluZSA9IGxv Z2ljYWxUb3BPZmZzZXRGcm9tUGFyZW50QmFzZWxpbmUgLSBpbmxpbmVMZXZlbEJveC0+bGF5b3V0 Qm91bmRzKCkuYXNjZW50OwogICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQog ICAgICAgICAgICAgY2FzZSBWZXJ0aWNhbEFsaWduOjpMZW5ndGg6IHsKICAgICAgICAgICAgICAg ICBhdXRvJiBzdHlsZSA9IGxheW91dEJveC5zdHlsZSgpOwotICAgICAgICAgICAgICAgIG9mZnNl dEZyb21QYXJlbnRJbmxpbmVCb3hCYXNlbGluZSA9IGZsb2F0VmFsdWVGb3JMZW5ndGgoc3R5bGUu dmVydGljYWxBbGlnbkxlbmd0aCgpLCBzdHlsZS5jb21wdXRlZExpbmVIZWlnaHQoKSk7Ci0gICAg ICAgICAgICAgICAgbG9naWNhbFRvcCA9IHBhcmVudElubGluZUJveC5iYXNlbGluZSgpIC0gb2Zm c2V0RnJvbVBhcmVudElubGluZUJveEJhc2VsaW5lIC0gaW5saW5lTGV2ZWxCb3gtPmxvZ2ljYWxI ZWlnaHQoKTsKKyAgICAgICAgICAgICAgICBhdXRvIGxvZ2ljYWxUb3BPZmZzZXRGcm9tUGFyZW50 QmFzZWxpbmUgPSBmbG9hdFZhbHVlRm9yTGVuZ3RoKHN0eWxlLnZlcnRpY2FsQWxpZ25MZW5ndGgo KSwgc3R5bGUuY29tcHV0ZWRMaW5lSGVpZ2h0KCkpICsgaW5saW5lTGV2ZWxCb3gtPmxheW91dEJv dW5kcygpLmhlaWdodCgpOworICAgICAgICAgICAgICAgIGxvZ2ljYWxUb3AgPSBwYXJlbnRJbmxp bmVCb3guYmFzZWxpbmUoKSAtIGxvZ2ljYWxUb3BPZmZzZXRGcm9tUGFyZW50QmFzZWxpbmU7Cisg ICAgICAgICAgICAgICAgYmFzZWxpbmVPZmZzZXRGcm9tUGFyZW50QmFzZWxpbmUgPSBsb2dpY2Fs VG9wT2Zmc2V0RnJvbVBhcmVudEJhc2VsaW5lIC0gaW5saW5lTGV2ZWxCb3gtPmxheW91dEJvdW5k cygpLmFzY2VudDsKICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KICAgICAg ICAgICAgIGRlZmF1bHQ6CkBAIC0zNjYsMTMgKzM3MywxNSBAQCB2b2lkIExpbmVCb3hCdWlsZGVy OjphbGlnbklubGluZUxldmVsQm94ZXNWZXJ0aWNhbGx5QW5kQ29tcHV0ZUxpbmVCb3hIZWlnaHQo TGluZQogICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgfQogICAgICAgICAgICAg aW5saW5lTGV2ZWxCb3gtPnNldExvZ2ljYWxUb3AobG9naWNhbFRvcCk7Ci0gICAgICAgICAgICBh dXRvIHBhcmVudEFic29sdXRlTG9naWNhbFRvcCA9IGFic29sdXRlTG9naWNhbFRvcEFuZEJvdHRv bU1hcC5nZXQoJnBhcmVudElubGluZUJveCkudG9wOwotICAgICAgICAgICAgYXV0byBhYnNvbHV0 ZUxvZ2ljYWxUb3AgPSBwYXJlbnRBYnNvbHV0ZUxvZ2ljYWxUb3AgKyBsb2dpY2FsVG9wOwotICAg ICAgICAgICAgYWJzb2x1dGVMb2dpY2FsVG9wQW5kQm90dG9tTWFwLmFkZChpbmxpbmVMZXZlbEJv eC5nZXQoKSwgQWJzb2x1dGVUb3BBbmRCb3R0b20geyBhYnNvbHV0ZUxvZ2ljYWxUb3AsIGFic29s dXRlTG9naWNhbFRvcCArIGlubGluZUxldmVsQm94LT5sYXlvdXRCb3VuZHMoKS5oZWlnaHQoKSwg aW5saW5lTGV2ZWxCb3guZ2V0KCkgfSk7Ci0KLSAgICAgICAgICAgIGF1dG8gYWZmZWN0c1Jvb3RJ bmxpbmVCb3hWZXJ0aWNhbFBvc3Rpb24gPSBpc1Jvb3RJbmxpbmVCb3gocGFyZW50SW5saW5lQm94 KSAmJiBxdWlya3Muc2hvdWxkSW5saW5lTGV2ZWxCb3hTdHJldGNoTGluZUJveChsaW5lQm94LCAq aW5saW5lTGV2ZWxCb3gpOwotICAgICAgICAgICAgaWYgKGFmZmVjdHNSb290SW5saW5lQm94VmVy dGljYWxQb3N0aW9uKQotICAgICAgICAgICAgICAgIG1heGltdW1PZmZzZXRGcm9tUm9vdElubGlu ZUJveEJhc2VsaW5lID0gc3RkOjptYXgobWF4aW11bU9mZnNldEZyb21Sb290SW5saW5lQm94QmFz ZWxpbmUsIG9mZnNldEZyb21QYXJlbnRJbmxpbmVCb3hCYXNlbGluZSk7CisgICAgICAgICAgICBh dXRvIHBhcmVudElubGluZUJveEFic29sdXRlR2VvbWV0cnkgPSBpbmxpbmVMZXZlbEJveEFic29s dXRlR2VvbWV0cnlNYXAuZ2V0KCZwYXJlbnRJbmxpbmVCb3gpOworICAgICAgICAgICAgYXV0byBh YnNvbHV0ZUxvZ2ljYWxUb3AgPSBwYXJlbnRJbmxpbmVCb3hBYnNvbHV0ZUdlb21ldHJ5LnRvcCAr IGxvZ2ljYWxUb3A7CisgICAgICAgICAgICBhdXRvIGFic29sdXRlTG9naWNhbEJvdHRvbSA9IGFi c29sdXRlTG9naWNhbFRvcCArIGlubGluZUxldmVsQm94LT5sYXlvdXRCb3VuZHMoKS5oZWlnaHQo KTsKKyAgICAgICAgICAgIGF1dG8gYWJzb2x1dGVCYXNlbGluZU9mZnNldEZyb21Sb290SW5saW5l Qm94QmFzZWxpbmUgPSBwYXJlbnRJbmxpbmVCb3hBYnNvbHV0ZUdlb21ldHJ5LmJhc2VsaW5lT2Zm c2V0RnJvbVJvb3RJbmxpbmVCb3hCYXNlbGluZSArIGJhc2VsaW5lT2Zmc2V0RnJvbVBhcmVudEJh c2VsaW5lOworICAgICAgICAgICAgaW5saW5lTGV2ZWxCb3hBYnNvbHV0ZUdlb21ldHJ5TWFwLmFk ZChpbmxpbmVMZXZlbEJveC5nZXQoKSwgQWJzb2x1dGVHZW9tZXRyeSB7IGFic29sdXRlTG9naWNh bFRvcCwgYWJzb2x1dGVMb2dpY2FsQm90dG9tLCBhYnNvbHV0ZUJhc2VsaW5lT2Zmc2V0RnJvbVJv b3RJbmxpbmVCb3hCYXNlbGluZSwgaW5saW5lTGV2ZWxCb3guZ2V0KCkgfSk7CisKKyAgICAgICAg ICAgIGF1dG8gYWZmZWN0c1Jvb3RJbmxpbmVCb3hWZXJ0aWNhbFBvc2l0aW9uID0gcXVpcmtzLnNo b3VsZElubGluZUxldmVsQm94U3RyZXRjaExpbmVCb3gobGluZUJveCwgKmlubGluZUxldmVsQm94 KTsKKyAgICAgICAgICAgIGlmIChhZmZlY3RzUm9vdElubGluZUJveFZlcnRpY2FsUG9zaXRpb24p CisgICAgICAgICAgICAgICAgbWF4aW11bVRvcE9mZnNldEZyb21Sb290SW5saW5lQm94QmFzZWxp bmUgPSBzdGQ6Om1heChtYXhpbXVtVG9wT2Zmc2V0RnJvbVJvb3RJbmxpbmVCb3hCYXNlbGluZSwg YWJzb2x1dGVCYXNlbGluZU9mZnNldEZyb21Sb290SW5saW5lQm94QmFzZWxpbmUgKyBpbmxpbmVM ZXZlbEJveC0+bGF5b3V0Qm91bmRzKCkuYXNjZW50KTsKICAgICAgICAgfQogICAgIH07CiAgICAg YWxpZ25JbmxpbmVCb3hSZWxhdGl2ZUlubGluZUxldmVsQm94ZXMoKTsKQEAgLTM4MywxMiArMzky LDEyIEBAIHZvaWQgTGluZUJveEJ1aWxkZXI6OmFsaWduSW5saW5lTGV2ZWxCb3hlc1ZlcnRpY2Fs bHlBbmRDb21wdXRlTGluZUJveEhlaWdodChMaW5lCiAgICAgICAgIC8vIEZJWE1FOiBBZGQgc3Vw cG9ydCBmb3IgbGF5b3V0IGJvdW5kcyBiYXNlZCBsaW5lIGJveCBoZWlnaHQuCiAgICAgICAgIGF1 dG8gbWluaW11bUxvZ2ljYWxUb3AgPSBPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiB7IH07CiAg ICAgICAgIGF1dG8gbWF4aW11bUxvZ2ljYWxCb3R0b20gPSBPcHRpb25hbDxJbmxpbmVMYXlvdXRV bml0PiB7IH07Ci0gICAgICAgIGZvciAoYXV0byBhYnNvbHV0ZUxvZ2ljYWxUb3BBbmRCb3R0b20g OiBhYnNvbHV0ZUxvZ2ljYWxUb3BBbmRCb3R0b21NYXAudmFsdWVzKCkpIHsKLSAgICAgICAgICAg IGF1dG8mIGlubGluZUxldmVsQm94ID0gKmFic29sdXRlTG9naWNhbFRvcEFuZEJvdHRvbS5pbmxp bmVMZXZlbEJveDsKKyAgICAgICAgZm9yIChhdXRvIGFic29sdXRlR2VvbWV0cnkgOiBpbmxpbmVM ZXZlbEJveEFic29sdXRlR2VvbWV0cnlNYXAudmFsdWVzKCkpIHsKKyAgICAgICAgICAgIGF1dG8m IGlubGluZUxldmVsQm94ID0gKmFic29sdXRlR2VvbWV0cnkuaW5saW5lTGV2ZWxCb3g7CiAgICAg ICAgICAgICBpZiAoIXF1aXJrcy5zaG91bGRJbmxpbmVMZXZlbEJveFN0cmV0Y2hMaW5lQm94KGxp bmVCb3gsIGlubGluZUxldmVsQm94KSkKICAgICAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAg ICAgICAgIG1pbmltdW1Mb2dpY2FsVG9wID0gc3RkOjptaW4obWluaW11bUxvZ2ljYWxUb3AudmFs dWVPcihhYnNvbHV0ZUxvZ2ljYWxUb3BBbmRCb3R0b20udG9wKSwgYWJzb2x1dGVMb2dpY2FsVG9w QW5kQm90dG9tLnRvcCk7Ci0gICAgICAgICAgICBtYXhpbXVtTG9naWNhbEJvdHRvbSA9IHN0ZDo6 bWF4KG1heGltdW1Mb2dpY2FsQm90dG9tLnZhbHVlT3IoYWJzb2x1dGVMb2dpY2FsVG9wQW5kQm90 dG9tLmJvdHRvbSksIGFic29sdXRlTG9naWNhbFRvcEFuZEJvdHRvbS5ib3R0b20pOworICAgICAg ICAgICAgbWluaW11bUxvZ2ljYWxUb3AgPSBzdGQ6Om1pbihtaW5pbXVtTG9naWNhbFRvcC52YWx1 ZU9yKGFic29sdXRlR2VvbWV0cnkudG9wKSwgYWJzb2x1dGVHZW9tZXRyeS50b3ApOworICAgICAg ICAgICAgbWF4aW11bUxvZ2ljYWxCb3R0b20gPSBzdGQ6Om1heChtYXhpbXVtTG9naWNhbEJvdHRv bS52YWx1ZU9yKGFic29sdXRlR2VvbWV0cnkuYm90dG9tKSwgYWJzb2x1dGVHZW9tZXRyeS5ib3R0 b20pOwogICAgICAgICB9CiAgICAgICAgIGlubGluZUJveFJlbGF0aXZlTG9naWNhbEhlaWdodCA9 IG1heGltdW1Mb2dpY2FsQm90dG9tLnZhbHVlT3IoSW5saW5lTGF5b3V0VW5pdCgpKSAtIG1pbmlt dW1Mb2dpY2FsVG9wLnZhbHVlT3IoSW5saW5lTGF5b3V0VW5pdCgpKTsKICAgICAgICAgbGluZUJv eExvZ2ljYWxIZWlnaHQgPSBpbmxpbmVCb3hSZWxhdGl2ZUxvZ2ljYWxIZWlnaHQ7CkBAIC00MDMs NyArNDEyLDcgQEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6YWxpZ25JbmxpbmVMZXZlbEJveGVzVmVy dGljYWxseUFuZENvbXB1dGVMaW5lQm94SGVpZ2h0KExpbmUKIAogICAgIGF1dG8gYWRqdXN0Um9v dElubGluZUJveFZlcnRpY2FsUG9zaXRpb24gPSBbJl0gewogICAgICAgICAvLyBGSVhNRTogQWRk IHN1cHBvcnQgZm9yIGNhc2VzIHdoZW4gdGhlIHN0cmV0Y2hpbmcgaW5saW5lIGJveGVzIGFyZSBu b3QgYmFzZWxpbmUgYWxpZ25lZC4KLSAgICAgICAgYXV0byByb290SW5saW5lQm94TG9naWNhbFRv cCA9IG1heGltdW1PZmZzZXRGcm9tUm9vdElubGluZUJveEJhc2VsaW5lIC0gcm9vdElubGluZUJv eC5sYXlvdXRCb3VuZHMoKS5hc2NlbnQ7CisgICAgICAgIGF1dG8gcm9vdElubGluZUJveExvZ2lj YWxUb3AgPSBtYXhpbXVtVG9wT2Zmc2V0RnJvbVJvb3RJbmxpbmVCb3hCYXNlbGluZSAtIHJvb3RJ bmxpbmVCb3gubGF5b3V0Qm91bmRzKCkuYXNjZW50OwogICAgICAgICByb290SW5saW5lQm94LnNl dExvZ2ljYWxUb3Aocm9vdElubGluZUJveExvZ2ljYWxUb3ApOwogICAgIH07CiAgICAgYWRqdXN0 Um9vdElubGluZUJveFZlcnRpY2FsUG9zaXRpb24oKTsK