184123 2018-03-28 20:18:01 -0700 [LayoutReloaded] Convert floating left/right stack display boxes absolute to the formatting context's root. 2018-03-28 20:29:21 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan webkit-bug-importer oldest_to_newest 1410167 0 zalan 2018-03-28 20:18:01 -0700 1. Store the displayBox and not the layoutBox 2. Clone the displayBox and convert its rect absolute to the formatting context's root. 1410169 1 336749 zalan 2018-03-28 20:23:33 -0700 Created attachment 336749 Patch 1410171 2 zalan 2018-03-28 20:28:03 -0700 Committed r230065: <https://trac.webkit.org/changeset/230065> 1410172 3 webkit-bug-importer 2018-03-28 20:29:21 -0700 <rdar://problem/38983916> 336749 2018-03-28 20:23:33 -0700 2018-03-28 20:23:33 -0700 Patch bug-184123-20180328202332.patch text/plain 8694 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwMDM4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYzdiMWUwZWM2MjNlM2FkOWU2Yjk1MThkODg2ZTcwMDFm YTNiNGRlNS4uNjYxMTkzNzkyYjYxNjBkOTkwMWE4YWVmM2EzYjFkNzZlNjIzZWQ3YyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3 IEBACisyMDE4LTAzLTI4ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAg ICAgW0xheW91dFJlbG9hZGVkXSBDb252ZXJ0IGZsb2F0aW5nIGxlZnQvcmlnaHQgc3RhY2sgZGlz cGxheSBib3hlcyBhYnNvbHV0ZSB0byB0aGUgZm9ybWF0dGluZyBjb250ZXh0J3Mgcm9vdC4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NDEyMworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIDEuIFRoZSBsZWZ0 L3JpZ2h0IGZsb2F0aW5nIGFycmF5IHNob3VsZCBob2xkIHRoZSBEaXNwbGF5LkJveCAoYW5kIG5v dCB0aGUgTGF5b3V0LkJveCkKKyAgICAgICAgMi4gQ2xvbmUgdGhlIERpc3BsYXkuQm94IGFuZCBj b252ZXJ0IGl0cyByZWN0IGFic29sdXRlIHRvIHRoZSBmb3JtYXR0aW5nIGNvbnRleHQncyByb290 IHNvIHRoYXQgd2UKKyAgICAgICAgZG9uJ3QgaGF2ZSB0byBrZWVwIGNvbnZlcnRpbmcgdGhlIGNv b3JkaW5hdGVzIHdoaWxlIGNvbXB1dGluZyB0aGUgcG9zaXRpb25zLiAKKworICAgICAgICAqIExh eW91dFJlbG9hZGVkL0Rpc3BsYXlUcmVlL0JveC5qczoKKyAgICAgICAgKERpc3BsYXkuQm94LnBy b3RvdHlwZS5jbG9uZSk6CisgICAgICAgIChEaXNwbGF5LkJveC5wcm90b3R5cGUuc2V0UmVjdCk6 CisgICAgICAgICogTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvRmxvYXRpbmdDb250 ZXh0LmpzOgorICAgICAgICAoRmxvYXRpbmdDb250ZXh0LnByb3RvdHlwZS5jb21wdXRlUG9zaXRp b24pOgorICAgICAgICAoRmxvYXRpbmdDb250ZXh0LnByb3RvdHlwZS5fcG9zaXRpb25Gb3JGbG9h dGluZyk6CisgICAgICAgIChGbG9hdGluZ0NvbnRleHQucHJvdG90eXBlLl9hZGRGbG9hdGluZyk6 CisgICAgICAgIChGbG9hdGluZ0NvbnRleHQucHJvdG90eXBlLl9tb3ZlVG9OZXh0VmVydGljYWxQ b3NpdGlvbik6CisgICAgICAgIChGbG9hdGluZ0NvbnRleHQucHJvdG90eXBlLl9hdmFpbGFibGVT cGFjZSk6CisgICAgICAgIChGbG9hdGluZ0NvbnRleHQucHJvdG90eXBlLl9maW5kRmxvYXRpbmdB dFZlcnRpY2FsUG9zaXRpb24pOgorICAgICAgICAoRmxvYXRpbmdDb250ZXh0LnByb3RvdHlwZS5f YWRqdXN0ZWRGbG9hdGluZ1Bvc2l0aW9uKToKKyAgICAgICAgKEZsb2F0aW5nQ29udGV4dC5wcm90 b3R5cGUuX2JvdHRvbSk6CisKIDIwMTgtMDMtMjggIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxl LmNvbT4KIAogICAgICAgICBbTGF5b3V0UmVsb2FkZWRdIElubGluZUZvcm1hdHRpbmdDb250ZXh0 OjpfaGFuZGxlVGV4dCBzaG91bGQgc3VwcG9ydCBydW5zIG9uIG11bHRpcGxlIGxpbmVzCmRpZmYg LS1naXQgYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9EaXNwbGF5VHJlZS9Cb3guanMgYi9Ub29scy9M YXlvdXRSZWxvYWRlZC9EaXNwbGF5VHJlZS9Cb3guanMKaW5kZXggNjdlZjBhNjAwZDg5NDcyY2Y4 NjFmMTg5M2VmM2I0OWVmOWM4ODlmYy4uNDVhYmJhNjJiZmU1NTQ2ZWMwMmE2Zjg5ZmQ0MGRjZGQz MDNmOTgzMSAxMDA2NDQKLS0tIGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRGlzcGxheVRyZWUvQm94 LmpzCisrKyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Rpc3BsYXlUcmVlL0JveC5qcwpAQCAtMzEs OSArMzEsMTkgQEAgRGlzcGxheS5Cb3ggPSBjbGFzcyBCb3ggewogICAgICAgICB0aGlzLm1fcmVj dCA9IG5ldyBMYXlvdXRSZWN0KG5ldyBMYXlvdXRQb2ludCgwLCAwKSwgbmV3IExheW91dFNpemUo MCwgMCkpOwogICAgIH0KIAorICAgIGNsb25lKCkgeworICAgICAgICBsZXQgY2xvbmVCb3ggPSBu ZXcgRGlzcGxheS5Cb3godGhpcy5tX25vZGUpOworICAgICAgICBjbG9uZUJveC5zZXRSZWN0KHRo aXMucmVjdCgpKTsKKyAgICAgICAgcmV0dXJuIGNsb25lQm94OworICAgIH0KKwogICAgIHJlY3Qo KSB7CiAgICAgICAgIHJldHVybiB0aGlzLm1fcmVjdC5jbG9uZSgpOwogICAgIH0KKworICAgIHNl dFJlY3QocmVjdCkgeworICAgICAgICByZXR1cm4gdGhpcy5tX3JlY3QgPSByZWN0OworICAgIH0K ICAgICAKICAgICB0b3AoKSB7CiAgICAgICAgIHJldHVybiB0aGlzLnJlY3QoKS50b3AoKTsKZGlm ZiAtLWdpdCBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Zsb2F0aW5n Q29udGV4dC5qcyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL0Zvcm1hdHRpbmdDb250ZXh0L0Zsb2F0 aW5nQ29udGV4dC5qcwppbmRleCA1OWNlZjlmZmQ0NGQxOWRmNmYxZTg5YjMxZThmMDBlZWVkYTFk YjUyLi41NTcyZDg1Mzk2ZGRkODlmNDIyZDQzYjhmNWEyYzA3N2JjY2M3Yjg0IDEwMDY0NAotLS0g YS9Ub29scy9MYXlvdXRSZWxvYWRlZC9Gb3JtYXR0aW5nQ29udGV4dC9GbG9hdGluZ0NvbnRleHQu anMKKysrIGIvVG9vbHMvTGF5b3V0UmVsb2FkZWQvRm9ybWF0dGluZ0NvbnRleHQvRmxvYXRpbmdD b250ZXh0LmpzCkBAIC0yMyw2ICsyMyw3IEBACiAgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElG IEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKKy8vIEFs bCBnZW9tZXRyeSBoZXJlIGlzIGFic29sdXRlIHRvIHRoZSBmb3JtYXR0aW5nIGNvbnRleHQncyBy b290LgogY2xhc3MgRmxvYXRpbmdDb250ZXh0IHsKICAgICBjb25zdHJ1Y3Rvcihmb3JtYXR0aW5n Q29udGV4dCkgewogICAgICAgICB0aGlzLm1fbGVmdEZsb2F0aW5nQm94U3RhY2sgPSBuZXcgQXJy YXkoKTsKQEAgLTM2LDkgKzM3LDkgQEAgY2xhc3MgRmxvYXRpbmdDb250ZXh0IHsKICAgICAgICAg ICAgIHJldHVybjsKICAgICAgICAgbGV0IGRpc3BsYXlCb3ggPSB0aGlzLl9mb3JtYXR0aW5nQ29u dGV4dCgpLmRpc3BsYXlCb3gobGF5b3V0Qm94KTsKICAgICAgICAgaWYgKGxheW91dEJveC5pc0Zs b2F0aW5nUG9zaXRpb25lZCgpKSB7Ci0gICAgICAgICAgICBsZXQgcG9zaXRpb24gPSB0aGlzLl9w b3NpdGlvbkZvckZsb2F0aW5nKGxheW91dEJveCk7CisgICAgICAgICAgICBkaXNwbGF5Qm94LnNl dFRvcExlZnQodGhpcy5fcG9zaXRpb25Gb3JGbG9hdGluZyhsYXlvdXRCb3gpKTsKICAgICAgICAg ICAgIHRoaXMuX2FkZEZsb2F0aW5nKGxheW91dEJveCk7Ci0gICAgICAgICAgICByZXR1cm4gZGlz cGxheUJveC5zZXRUb3BMZWZ0KHBvc2l0aW9uKTsKKyAgICAgICAgICAgIHJldHVybjsKICAgICAg ICAgfQogICAgICAgICBpZiAoVXRpbHMuaGFzQ2xlYXIobGF5b3V0Qm94KSkKICAgICAgICAgICAg IHJldHVybiBkaXNwbGF5Qm94LnNldFRvcExlZnQodGhpcy5fcG9zaXRpb25Gb3JDbGVhcihsYXlv dXRCb3gpKTsKQEAgLTU5LDEwICs2MCwxMSBAQCBjbGFzcyBGbG9hdGluZ0NvbnRleHQgewogICAg IH0KIAogICAgIF9wb3NpdGlvbkZvckZsb2F0aW5nKGZsb2F0aW5nQm94KSB7CisgICAgICAgIGxl dCBhYnNvbHV0ZUZsb2F0aW5nQm94ID0gdGhpcy5fZm9ybWF0dGluZ0NvbnRleHQoKS5hYnNvbHV0 ZU1hcmdpbkJveChmbG9hdGluZ0JveCk7CiAgICAgICAgIGlmICh0aGlzLl9pc0VtcHR5KCkpCi0g ICAgICAgICAgICByZXR1cm4gdGhpcy5fYWRqdXN0ZWRGbG9hdGluZ1Bvc2l0aW9uKGZsb2F0aW5n Qm94LCB0aGlzLl9mb3JtYXR0aW5nQ29udGV4dCgpLmFic29sdXRlTWFyZ2luQm94KGZsb2F0aW5n Qm94KS50b3AoKSk7Ci0gICAgICAgIGxldCB2ZXJ0aWNhbFBvc2l0aW9uID0gTWF0aC5tYXgodGhp cy5fZm9ybWF0dGluZ0NvbnRleHQoKS5hYnNvbHV0ZU1hcmdpbkJveChmbG9hdGluZ0JveCkudG9w KCksIHRoaXMuX2Zvcm1hdHRpbmdDb250ZXh0KCkuYWJzb2x1dGVNYXJnaW5Cb3godGhpcy5tX2xh c3RGbG9hdGluZykudG9wKCkpOwotICAgICAgICBsZXQgc3BhY2VOZWVkZWQgPSB0aGlzLl9mb3Jt YXR0aW5nQ29udGV4dCgpLmFic29sdXRlTWFyZ2luQm94KGZsb2F0aW5nQm94KS53aWR0aCgpOwor ICAgICAgICAgICAgcmV0dXJuIHRoaXMuX2FkanVzdGVkRmxvYXRpbmdQb3NpdGlvbihmbG9hdGlu Z0JveCwgYWJzb2x1dGVGbG9hdGluZ0JveC50b3AoKSk7CisgICAgICAgIGxldCB2ZXJ0aWNhbFBv c2l0aW9uID0gTWF0aC5tYXgoYWJzb2x1dGVGbG9hdGluZ0JveC50b3AoKSwgdGhpcy5tX2xhc3RG bG9hdGluZy50b3AoKSk7CisgICAgICAgIGxldCBzcGFjZU5lZWRlZCA9IGFic29sdXRlRmxvYXRp bmdCb3gud2lkdGgoKTsKICAgICAgICAgd2hpbGUgKHRydWUpIHsKICAgICAgICAgICAgIGxldCBm bG9hdGluZ1BhaXIgPSB0aGlzLl9maW5kSW5uZXJNb3N0TGVmdEFuZFJpZ2h0KHZlcnRpY2FsUG9z aXRpb24pOwogICAgICAgICAgICAgaWYgKHRoaXMuX2F2YWlsYWJsZVNwYWNlKGZsb2F0aW5nQm94 LmNvbnRhaW5pbmdCbG9jaygpLCBmbG9hdGluZ1BhaXIpID49IHNwYWNlTmVlZGVkKQpAQCAtMTA1 LDEyICsxMDcsMTUgQEAgY2xhc3MgRmxvYXRpbmdDb250ZXh0IHsKICAgICB9CiAKICAgICBfYWRk RmxvYXRpbmcoZmxvYXRpbmdCb3gpIHsKLSAgICAgICAgdGhpcy5tX2xhc3RGbG9hdGluZyA9IGZs b2F0aW5nQm94OworICAgICAgICAvLyBDb252ZXJ0IGZsb2F0aW5nIGJveCB0byBhYnNvbHV0ZS4K KyAgICAgICAgbGV0IGZsb2F0aW5nRGlzcGxheUJveCA9IHRoaXMuX2Zvcm1hdHRpbmdDb250ZXh0 KCkuZGlzcGxheUJveChmbG9hdGluZ0JveCkuY2xvbmUoKTsKKyAgICAgICAgZmxvYXRpbmdEaXNw bGF5Qm94LnNldFJlY3QodGhpcy5fZm9ybWF0dGluZ0NvbnRleHQoKS5hYnNvbHV0ZU1hcmdpbkJv eChmbG9hdGluZ0JveCkpOworICAgICAgICB0aGlzLm1fbGFzdEZsb2F0aW5nID0gZmxvYXRpbmdE aXNwbGF5Qm94OwogICAgICAgICBpZiAoVXRpbHMuaXNGbG9hdGluZ0xlZnQoZmxvYXRpbmdCb3gp KSB7Ci0gICAgICAgICAgICB0aGlzLm1fbGVmdEZsb2F0aW5nQm94U3RhY2sucHVzaChmbG9hdGlu Z0JveCk7CisgICAgICAgICAgICB0aGlzLm1fbGVmdEZsb2F0aW5nQm94U3RhY2sucHVzaChmbG9h dGluZ0Rpc3BsYXlCb3gpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9Ci0gICAgICAg IHRoaXMubV9yaWdodEZsb2F0aW5nQm94U3RhY2sucHVzaChmbG9hdGluZ0JveCk7CisgICAgICAg IHRoaXMubV9yaWdodEZsb2F0aW5nQm94U3RhY2sucHVzaChmbG9hdGluZ0Rpc3BsYXlCb3gpOwog ICAgIH0KIAogICAgIF9maW5kSW5uZXJNb3N0TGVmdEFuZFJpZ2h0KHZlcnRpY2FsUG9zaXRpb24p IHsKQEAgLTEyNSwyNiArMTMwLDI2IEBAIGNsYXNzIEZsb2F0aW5nQ29udGV4dCB7CiAgICAgICAg IGxldCBsZWZ0Qm90dG9tID0gTnVtYmVyLlBPU0lUSVZFX0lORklOSVRZOwogICAgICAgICBsZXQg cmlnaHRCb3R0b20gPSBOdW1iZXIuUE9TSVRJVkVfSU5GSU5JVFk7CiAgICAgICAgIGlmIChmbG9h dGluZ1BhaXIubGVmdCkKLSAgICAgICAgICAgIGxlZnRCb3R0b20gPSB0aGlzLl9mb3JtYXR0aW5n Q29udGV4dCgpLmFic29sdXRlTWFyZ2luQm94KGZsb2F0aW5nUGFpci5sZWZ0KS5ib3R0b20oKTsK KyAgICAgICAgICAgIGxlZnRCb3R0b20gPSBmbG9hdGluZ1BhaXIubGVmdC5ib3R0b20oKTsKICAg ICAgICAgaWYgKGZsb2F0aW5nUGFpci5yaWdodCkKLSAgICAgICAgICAgIHJpZ2h0Qm90dG9tID0g dGhpcy5fZm9ybWF0dGluZ0NvbnRleHQoKS5hYnNvbHV0ZU1hcmdpbkJveChmbG9hdGluZ1BhaXIu cmlnaHQpLmJvdHRvbSgpOworICAgICAgICAgICAgcmlnaHRCb3R0b20gPSBmbG9hdGluZ1BhaXIu cmlnaHQuYm90dG9tKCk7CiAgICAgICAgIHJldHVybiBNYXRoLm1pbihsZWZ0Qm90dG9tLCByaWdo dEJvdHRvbSk7CiAgICAgfQogCiAgICAgX2F2YWlsYWJsZVNwYWNlKGNvbnRhaW5pbmdCbG9jaywg ZmxvYXRpbmdQYWlyKSB7CiAgICAgICAgIGxldCBjb250YWluaW5nQmxvY2tDb250ZW50Qm94ID0g dGhpcy5fZm9ybWF0dGluZ0NvbnRleHQoKS5kaXNwbGF5Qm94KGNvbnRhaW5pbmdCbG9jayk7CiAg ICAgICAgIGlmIChmbG9hdGluZ1BhaXIubGVmdCAmJiBmbG9hdGluZ1BhaXIucmlnaHQpCi0gICAg ICAgICAgICByZXR1cm4gdGhpcy5fZm9ybWF0dGluZ0NvbnRleHQoKS5hYnNvbHV0ZU1hcmdpbkJv eChmbG9hdGluZ1BhaXIucmlnaHQpLmxlZnQoKSAtIHRoaXMuX2Zvcm1hdHRpbmdDb250ZXh0KCku YWJzb2x1dGVNYXJnaW5Cb3goZmxvYXRpbmdQYWlyLmxlZnQpLnJpZ2h0KCk7CisgICAgICAgICAg ICByZXR1cm4gZmxvYXRpbmdQYWlyLnJpZ2h0LmxlZnQoKSAtIGZsb2F0aW5nUGFpci5sZWZ0LnJp Z2h0KCk7CiAgICAgICAgIGlmIChmbG9hdGluZ1BhaXIubGVmdCkKLSAgICAgICAgICAgIHJldHVy biBjb250YWluaW5nQmxvY2tDb250ZW50Qm94LndpZHRoKCkgLSAodGhpcy5fZm9ybWF0dGluZ0Nv bnRleHQoKS5hYnNvbHV0ZU1hcmdpbkJveChmbG9hdGluZ1BhaXIubGVmdCkucmlnaHQoKSAtIHRo aXMuX2Zvcm1hdHRpbmdDb250ZXh0KCkuYWJzb2x1dGVCb3JkZXJCb3goY29udGFpbmluZ0Jsb2Nr KS5sZWZ0KCkpOworICAgICAgICAgICAgcmV0dXJuIGNvbnRhaW5pbmdCbG9ja0NvbnRlbnRCb3gu d2lkdGgoKSAtIChmbG9hdGluZ1BhaXIubGVmdC5yaWdodCgpIC0gdGhpcy5fZm9ybWF0dGluZ0Nv bnRleHQoKS5hYnNvbHV0ZUJvcmRlckJveChjb250YWluaW5nQmxvY2spLmxlZnQoKSk7CiAgICAg ICAgIGlmIChmbG9hdGluZ1BhaXIucmlnaHQpCi0gICAgICAgICAgICByZXR1cm4gdGhpcy5fZm9y bWF0dGluZ0NvbnRleHQoKS5hYnNvbHV0ZU1hcmdpbkJveChmbG9hdGluZ1BhaXIucmlnaHQpLmxl ZnQoKTsKKyAgICAgICAgICAgIHJldHVybiBmbG9hdGluZ1BhaXIucmlnaHQubGVmdCgpOwogICAg ICAgICByZXR1cm4gY29udGFpbmluZ0Jsb2NrQ29udGVudEJveC53aWR0aCgpOwogICAgIH0KIAog ICAgIF9maW5kRmxvYXRpbmdBdFZlcnRpY2FsUG9zaXRpb24odmVydGljYWxQb3NpdGlvbiwgZmxv YXRpbmdTdGFjaykgewogICAgICAgICBsZXQgaW5kZXggPSBmbG9hdGluZ1N0YWNrLmxlbmd0aDsK LSAgICAgICAgd2hpbGUgKC0taW5kZXggPj0gMCAmJiB0aGlzLl9mb3JtYXR0aW5nQ29udGV4dCgp LmFic29sdXRlTWFyZ2luQm94KGZsb2F0aW5nU3RhY2tbaW5kZXhdKS5ib3R0b20oKSA8PSB2ZXJ0 aWNhbFBvc2l0aW9uKTsKKyAgICAgICAgd2hpbGUgKC0taW5kZXggPj0gMCAmJiBmbG9hdGluZ1N0 YWNrW2luZGV4XS5ib3R0b20oKSA8PSB2ZXJ0aWNhbFBvc2l0aW9uKTsKICAgICAgICAgcmV0dXJu IGluZGV4ID49IDAgPyBmbG9hdGluZ1N0YWNrW2luZGV4XSA6IG51bGw7CiAgICAgfQogCkBAIC0x NTksMTMgKzE2NCwxMyBAQCBjbGFzcyBGbG9hdGluZ0NvbnRleHQgewogICAgICAgICBsZXQgcmln aHQgPSB0aGlzLl9mb3JtYXR0aW5nQ29udGV4dCgpLmFic29sdXRlQ29udGVudEJveChjb250YWlu aW5nQmxvY2spLnJpZ2h0KCk7CiAgICAgICAgIGlmIChsZWZ0UmlnaHRGbG9hdGluZ3MpIHsKICAg ICAgICAgICAgIGlmIChsZWZ0UmlnaHRGbG9hdGluZ3MubGVmdCkgewotICAgICAgICAgICAgICAg IGxldCBmbG9hdGluZ0JveFJpZ2h0ID0gdGhpcy5fZm9ybWF0dGluZ0NvbnRleHQoKS5hYnNvbHV0 ZU1hcmdpbkJveChsZWZ0UmlnaHRGbG9hdGluZ3MubGVmdCkucmlnaHQoKTsKKyAgICAgICAgICAg ICAgICBsZXQgZmxvYXRpbmdCb3hSaWdodCA9IGxlZnRSaWdodEZsb2F0aW5ncy5sZWZ0LnJpZ2h0 KCk7CiAgICAgICAgICAgICAgICAgaWYgKGZsb2F0aW5nQm94UmlnaHQgPiBsZWZ0KQogICAgICAg ICAgICAgICAgICAgICBsZWZ0ID0gZmxvYXRpbmdCb3hSaWdodDsKICAgICAgICAgICAgIH0KIAog ICAgICAgICAgICAgaWYgKGxlZnRSaWdodEZsb2F0aW5ncy5yaWdodCkgewotICAgICAgICAgICAg ICAgIGxldCBmbG9hdGluZ0JveExlZnQgPSB0aGlzLl9mb3JtYXR0aW5nQ29udGV4dCgpLmFic29s dXRlTWFyZ2luQm94KGxlZnRSaWdodEZsb2F0aW5ncy5yaWdodCkubGVmdCgpOworICAgICAgICAg ICAgICAgIGxldCBmbG9hdGluZ0JveExlZnQgPSBsZWZ0UmlnaHRGbG9hdGluZ3MucmlnaHQubGVm dCgpOwogICAgICAgICAgICAgICAgIGlmIChmbG9hdGluZ0JveExlZnQgPCByaWdodCkKICAgICAg ICAgICAgICAgICAgICAgcmlnaHQgPSBmbG9hdGluZ0JveExlZnQ7CiAgICAgICAgICAgICB9CkBA IC0xOTAsNyArMTk1LDcgQEAgY2xhc3MgRmxvYXRpbmdDb250ZXh0IHsKICAgICAgICAgICAgIHJl dHVybiBOdW1iZXIuTmFOOwogICAgICAgICBsZXQgbWF4ID0gTnVtYmVyLk5FR0FUSVZFX0lORklO SVRZOwogICAgICAgICBmb3IgKGxldCBpID0gMDsgaSA8IGZsb2F0aW5nU3RhY2subGVuZ3RoOyAr K2kpCi0gICAgICAgICAgICBtYXggPSBNYXRoLm1heCh0aGlzLl9mb3JtYXR0aW5nQ29udGV4dCgp LmFic29sdXRlTWFyZ2luQm94KGZsb2F0aW5nU3RhY2tbaV0pLmJvdHRvbSgpLCBtYXgpOworICAg ICAgICAgICAgbWF4ID0gTWF0aC5tYXgoZmxvYXRpbmdTdGFja1tpXS5ib3R0b20oKSwgbWF4KTsK ICAgICAgICAgcmV0dXJuIG1heDsKICAgICB9CiAK