212183 2020-05-20 20:30:07 -0700 [LFC][TFC] Collapse in-between cell borders 2020-05-21 05:34:13 -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 1654785 0 zalan 2020-05-20 20:30:07 -0700 ssia 1654786 1 399925 zalan 2020-05-20 20:34:23 -0700 Created attachment 399925 Patch 1654875 2 ews-feeder 2020-05-21 05:33:04 -0700 Committed r261991: <https://trac.webkit.org/changeset/261991> All reviewed patches have been landed. Closing bug and clearing flags on attachment 399925. 1654876 3 webkit-bug-importer 2020-05-21 05:34:13 -0700 <rdar://problem/63489986> 399925 2020-05-20 20:34:23 -0700 2020-05-21 05:33:04 -0700 Patch bug-212183-20200520203422.patch text/plain 11310 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxODEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2FmZDMwNDZmMmIxMDI0 NWFmZmIwYmJjMWQ4ZDMwYjZlYzgyYTY1NS4uODUxMDMyM2JhZWFjYTNhNDc5YzYxM2Q5ZTJlNzJi OTBmMmQzOThlNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIwLTA1LTIwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bVEZDXSBDb2xsYXBz ZSBpbi1iZXR3ZWVuIGNlbGwgYm9yZGVycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjEyMTgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVGhpcyBwYXRjaCBleHBhbmRzIGJvcmRlciBjb2xsYXBzaW5nIHRv IGluLWJldHdlZW4gY2VsbCBib3JkZXJzLgorCisgICAgICAgIFRlc3Q6IGZhc3QvbGF5b3V0Zm9y bWF0dGluZ2NvbnRleHQvdGFibGUtc2ltcGxlLWJvcmRlci1jb2xsYXBzZTMuaHRtbAorCisgICAg ICAgICogbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0 Q2VsbCk6CisgICAgICAgICogbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdD b250ZXh0Lmg6CisgICAgICAgICogbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRp bmdDb250ZXh0R2VvbWV0cnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpUYWJsZUZv cm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6Y29tcHV0ZWRDZWxsQm9yZGVyIGNvbnN0KToKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6VGFibGVGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6 OmludHJpbnNpY1dpZHRoQ29uc3RyYWludHNGb3JDZWxsKToKKwogMjAyMC0wNS0yMCAgWmFsYW4g QnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW1RGQ10gUHJlZmVycmVk IHdpZHRoIGNvbXB1dGF0aW9uIHNob3VsZCB0YWtlIGJvcmRlciBjb2xsYXBzaW5nIGludG8gYWNj b3VudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9U YWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZv cm1hdHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggYTRjMDAzNzY3MzNiYjQ3 MDJiNGMyMWM0MzdjNGRhMTJjOTRlOWQzYy4uNWMzOTBkNTBjZDNmYWM0ODZmOGI2YmNjZjE1NDRi NTI5YTIyMmYyYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0 dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBAIC0xOTksMjMg KzE5OSw3IEBAIHZvaWQgVGFibGVGb3JtYXR0aW5nQ29udGV4dDo6bGF5b3V0Q2VsbChjb25zdCBU YWJsZUdyaWQ6OkNlbGwmIGNlbGwsIExheW91dFVuaXQKICAgICBhdXRvJiBjZWxsQm94ID0gY2Vs bC5ib3goKTsKICAgICBhdXRvJiBjZWxsRGlzcGxheUJveCA9IGZvcm1hdHRpbmdTdGF0ZSgpLmRp c3BsYXlCb3goY2VsbEJveCk7CiAKLSAgICBhdXRvIGNvbXB1dGVkQ2VsbEJvcmRlciA9IFsmXSB7 Ci0gICAgICAgIGF1dG8gYm9yZGVyID0gZ2VvbWV0cnkoKS5jb21wdXRlZEJvcmRlcihjZWxsQm94 KTsKLSAgICAgICAgYXV0byBjb2xsYXBzZWRCb3JkZXIgPSBncmlkLmNvbGxhcHNlZEJvcmRlcigp OwotICAgICAgICBpZiAoIWNvbGxhcHNlZEJvcmRlcikKLSAgICAgICAgICAgIHJldHVybiBib3Jk ZXI7Ci0gICAgICAgIGF1dG8gY2VsbFBvc2l0aW9uID0gY2VsbC5wb3NpdGlvbigpOwotICAgICAg ICBpZiAoIWNlbGxQb3NpdGlvbi5jb2x1bW4pCi0gICAgICAgICAgICBib3JkZXIuaG9yaXpvbnRh bC5sZWZ0ID0gY29sbGFwc2VkQm9yZGVyLT5ob3Jpem9udGFsLmxlZnQgLyAyOwotICAgICAgICBp ZiAoY2VsbFBvc2l0aW9uLmNvbHVtbiA9PSBncmlkLmNvbHVtbnMoKS5zaXplKCkgLSAxKQotICAg ICAgICAgICAgYm9yZGVyLmhvcml6b250YWwucmlnaHQgPSBjb2xsYXBzZWRCb3JkZXItPmhvcml6 b250YWwucmlnaHQgLyAyOwotICAgICAgICBpZiAoIWNlbGxQb3NpdGlvbi5yb3cpCi0gICAgICAg ICAgICBib3JkZXIudmVydGljYWwudG9wID0gY29sbGFwc2VkQm9yZGVyLT52ZXJ0aWNhbC50b3Ag LyAyOwotICAgICAgICBpZiAoY2VsbFBvc2l0aW9uLnJvdyA9PSBncmlkLnJvd3MoKS5zaXplKCkg LSAxKQotICAgICAgICAgICAgYm9yZGVyLnZlcnRpY2FsLmJvdHRvbSA9IGNvbGxhcHNlZEJvcmRl ci0+dmVydGljYWwuYm90dG9tIC8gMjsKLSAgICAgICAgcmV0dXJuIGJvcmRlcjsKLSAgICB9KCk7 Ci0gICAgY2VsbERpc3BsYXlCb3guc2V0Qm9yZGVyKGNvbXB1dGVkQ2VsbEJvcmRlcik7CisgICAg Y2VsbERpc3BsYXlCb3guc2V0Qm9yZGVyKGdlb21ldHJ5KCkuY29tcHV0ZWRDZWxsQm9yZGVyKGNl bGwpKTsKICAgICBjZWxsRGlzcGxheUJveC5zZXRQYWRkaW5nKGdlb21ldHJ5KCkuY29tcHV0ZWRQ YWRkaW5nKGNlbGxCb3gsIGF2YWlsYWJsZUhvcml6b250YWxTcGFjZSkpOwogICAgIC8vIEludGVy bmFsIHRhYmxlIGVsZW1lbnRzIGRvIG5vdCBoYXZlIG1hcmdpbnMuCiAgICAgY2VsbERpc3BsYXlC b3guc2V0SG9yaXpvbnRhbE1hcmdpbih7IH0pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0LmggYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuaApp bmRleCBiZjVkMmRmNzliZWUwOWE4ODY0YzVlMDg0OWRjMjIzM2MyZWIxMGM1Li4wYzA0MjdhNWFl MjI5NTdkMTQ1OGJmYjU1ODViN2E3MjBhYmYwYTIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRl eHQuaApAQCAtNjYsNiArNjYsNyBAQCBwcml2YXRlOgogICAgIGNsYXNzIEdlb21ldHJ5IDogcHVi bGljIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeSB7CiAgICAgcHVibGljOgogICAgICAgICBM YXlvdXRVbml0IGNlbGxIZWlnaChjb25zdCBDb250YWluZXJCb3gmKSBjb25zdDsKKyAgICAgICAg RWRnZXMgY29tcHV0ZWRDZWxsQm9yZGVyKGNvbnN0IFRhYmxlR3JpZDo6Q2VsbCYpIGNvbnN0Owog ICAgICAgICBPcHRpb25hbDxMYXlvdXRVbml0PiBjb21wdXRlZENvbHVtbldpZHRoKGNvbnN0IENv bnRhaW5lckJveCYgY29sdW1uQm94KSBjb25zdDsKICAgICAgICAgRm9ybWF0dGluZ0NvbnRleHQ6 OkludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgaW50cmluc2ljV2lkdGhDb25zdHJhaW50c0ZvckNl bGwoY29uc3QgVGFibGVHcmlkOjpDZWxsJik7CiAgICAgICAgIElubGluZUxheW91dFVuaXQgdXNl ZEJhc2VsaW5lRm9yQ2VsbChjb25zdCBDb250YWluZXJCb3gmIGNlbGxCb3gpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdD b250ZXh0R2VvbWV0cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGlu Zy9UYWJsZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IDYwMDlkM2YzYTg3MjUy ZjI0ZWU2NmIxYzBmNTRmZWM4ZGVlMWEyZDMuLjE4M2Q2NWNhNGQ2NDI3OTQzYWJiN2RmMDhhNjFj NjhkOTE4MmU3NmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC90YWJsZWZvcm1h dHRpbmcvVGFibGVGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRy eS5jcHAKQEAgLTQ0LDYgKzQ0LDQzIEBAIExheW91dFVuaXQgVGFibGVGb3JtYXR0aW5nQ29udGV4 dDo6R2VvbWV0cnk6OmNlbGxIZWlnaChjb25zdCBDb250YWluZXJCb3gmIGNlbGxCCiAgICAgcmV0 dXJuIGNvbnRlbnRIZWlnaHRGb3JGb3JtYXR0aW5nQ29udGV4dFJvb3QoY2VsbEJveCk7CiB9CiAK K0VkZ2VzIFRhYmxlRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojpjb21wdXRlZENlbGxCb3Jk ZXIoY29uc3QgVGFibGVHcmlkOjpDZWxsJiBjZWxsKSBjb25zdAoreworICAgIGF1dG8mIGNlbGxC b3ggPSBjZWxsLmJveCgpOworICAgIGF1dG8gYm9yZGVyID0gY29tcHV0ZWRCb3JkZXIoY2VsbEJv eCk7CisgICAgYXV0byBjb2xsYXBzZWRCb3JkZXIgPSBtX2dyaWQuY29sbGFwc2VkQm9yZGVyKCk7 CisgICAgaWYgKCFjb2xsYXBzZWRCb3JkZXIpCisgICAgICAgIHJldHVybiBib3JkZXI7CisKKyAg ICAvLyBXZSBtaWdodCB3YW50IHRvIGNhY2hlIHRoZXNlIGNvbGxhcHNlZCBib3JkZXJzIG9uIHRo ZSBncmlkLgorICAgIGF1dG8gY2VsbFBvc2l0aW9uID0gY2VsbC5wb3NpdGlvbigpOworICAgIGlm ICghY2VsbFBvc2l0aW9uLmNvbHVtbikKKyAgICAgICAgYm9yZGVyLmhvcml6b250YWwubGVmdCA9 IGNvbGxhcHNlZEJvcmRlci0+aG9yaXpvbnRhbC5sZWZ0IC8gMjsKKyAgICBlbHNlIHsKKyAgICAg ICAgYXV0byBhZGphY2VudEJvcmRlclJpZ2h0ID0gY29tcHV0ZWRCb3JkZXIobV9ncmlkLnNsb3Qo eyBjZWxsUG9zaXRpb24uY29sdW1uIC0gMSwgY2VsbFBvc2l0aW9uLnJvdyB9KS0+Y2VsbCgpLmJv eCgpKS5ob3Jpem9udGFsLnJpZ2h0OworICAgICAgICBib3JkZXIuaG9yaXpvbnRhbC5sZWZ0ID0g c3RkOjptYXgoYm9yZGVyLmhvcml6b250YWwubGVmdCwgYWRqYWNlbnRCb3JkZXJSaWdodCkgLyAy OworICAgIH0KKyAgICBpZiAoY2VsbFBvc2l0aW9uLmNvbHVtbiA9PSBtX2dyaWQuY29sdW1ucygp LnNpemUoKSAtIDEpCisgICAgICAgIGJvcmRlci5ob3Jpem9udGFsLnJpZ2h0ID0gY29sbGFwc2Vk Qm9yZGVyLT5ob3Jpem9udGFsLnJpZ2h0IC8gMjsKKyAgICBlbHNlIHsKKyAgICAgICAgYXV0byBh ZGphY2VudEJvcmRlckxlZnQgPSBjb21wdXRlZEJvcmRlcihtX2dyaWQuc2xvdCh7IGNlbGxQb3Np dGlvbi5jb2x1bW4gKyAxLCBjZWxsUG9zaXRpb24ucm93IH0pLT5jZWxsKCkuYm94KCkpLmhvcml6 b250YWwubGVmdDsKKyAgICAgICAgYm9yZGVyLmhvcml6b250YWwucmlnaHQgPSBzdGQ6Om1heChi b3JkZXIuaG9yaXpvbnRhbC5yaWdodCwgYWRqYWNlbnRCb3JkZXJMZWZ0KSAvIDI7CisgICAgfQor ICAgIGlmICghY2VsbFBvc2l0aW9uLnJvdykKKyAgICAgICAgYm9yZGVyLnZlcnRpY2FsLnRvcCA9 IGNvbGxhcHNlZEJvcmRlci0+dmVydGljYWwudG9wIC8gMjsKKyAgICBlbHNlIHsKKyAgICAgICAg YXV0byBhZGphY2VudEJvcmRlckJvdHRvbSA9IGNvbXB1dGVkQm9yZGVyKG1fZ3JpZC5zbG90KHsg Y2VsbFBvc2l0aW9uLmNvbHVtbiwgY2VsbFBvc2l0aW9uLnJvdyAtIDEgfSktPmNlbGwoKS5ib3go KSkudmVydGljYWwuYm90dG9tOworICAgICAgICBib3JkZXIudmVydGljYWwudG9wID0gc3RkOjpt YXgoYm9yZGVyLnZlcnRpY2FsLnRvcCwgYWRqYWNlbnRCb3JkZXJCb3R0b20pIC8gMjsKKyAgICB9 CisgICAgaWYgKGNlbGxQb3NpdGlvbi5yb3cgPT0gbV9ncmlkLnJvd3MoKS5zaXplKCkgLSAxKQor ICAgICAgICBib3JkZXIudmVydGljYWwuYm90dG9tID0gY29sbGFwc2VkQm9yZGVyLT52ZXJ0aWNh bC5ib3R0b20gLyAyOworICAgIGVsc2UgeworICAgICAgICBhdXRvIGFkamFjZW50Qm9yZGVyVG9w ID0gY29tcHV0ZWRCb3JkZXIobV9ncmlkLnNsb3QoeyBjZWxsUG9zaXRpb24uY29sdW1uLCBjZWxs UG9zaXRpb24ucm93ICsgMSB9KS0+Y2VsbCgpLmJveCgpKS52ZXJ0aWNhbC50b3A7CisgICAgICAg IGJvcmRlci52ZXJ0aWNhbC5ib3R0b20gPSBzdGQ6Om1heChib3JkZXIudmVydGljYWwuYm90dG9t LCBhZGphY2VudEJvcmRlclRvcCkgLyAyOworICAgIH0KKyAgICByZXR1cm4gYm9yZGVyOworfQor CiBPcHRpb25hbDxMYXlvdXRVbml0PiBUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6 Y29tcHV0ZWRDb2x1bW5XaWR0aChjb25zdCBDb250YWluZXJCb3gmIGNvbHVtbkJveCkgY29uc3QK IHsKICAgICAvLyBDaGVjayBib3RoIHN0eWxlIGFuZCA8Y29sPidzIHdpZHRoIGF0dHJpYnV0ZS4K QEAgLTU4LDMzICs5NSwyMCBAQCBGb3JtYXR0aW5nQ29udGV4dDo6SW50cmluc2ljV2lkdGhDb25z dHJhaW50cyBUYWJsZUZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aQogICAgIGF1dG8mIGNl bGxCb3ggPSBjZWxsLmJveCgpOwogICAgIGF1dG8mIHN0eWxlID0gY2VsbEJveC5zdHlsZSgpOwog Ci0gICAgYXV0byBjb21wdXRlZEhvcml6b250YWxCb3JkZXIgPSBbJl0gewotICAgICAgICBhdXRv IGxlZnRCb3JkZXJXaWR0aCA9IExheW91dFVuaXQgeyBzdHlsZS5ib3JkZXJMZWZ0V2lkdGgoKSB9 OwotICAgICAgICBhdXRvIHJpZ2h0Qm9yZGVyV2lkdGggPSBMYXlvdXRVbml0IHsgc3R5bGUuYm9y ZGVyUmlnaHRXaWR0aCgpIH07Ci0gICAgICAgIGlmIChhdXRvIGNvbGxhcHNlZEJvcmRlciA9IG1f Z3JpZC5jb2xsYXBzZWRCb3JkZXIoKSkgewotICAgICAgICAgICAgYXV0byBjZWxsUG9zaXRpb24g PSBjZWxsLnBvc2l0aW9uKCk7Ci0gICAgICAgICAgICBpZiAoIWNlbGxQb3NpdGlvbi5jb2x1bW4p Ci0gICAgICAgICAgICAgICAgbGVmdEJvcmRlcldpZHRoID0gY29sbGFwc2VkQm9yZGVyLT5ob3Jp em9udGFsLmxlZnQgLyAyOwotICAgICAgICAgICAgaWYgKGNlbGxQb3NpdGlvbi5jb2x1bW4gPT0g bV9ncmlkLmNvbHVtbnMoKS5zaXplKCkgLSAxKQotICAgICAgICAgICAgICAgIHJpZ2h0Qm9yZGVy V2lkdGggPSBjb2xsYXBzZWRCb3JkZXItPmhvcml6b250YWwucmlnaHQgLyAyOwotICAgICAgICB9 Ci0gICAgICAgIHJldHVybiBsZWZ0Qm9yZGVyV2lkdGggKyByaWdodEJvcmRlcldpZHRoOwotICAg IH07Ci0KICAgICBhdXRvIGNvbXB1dGVkSW50cmluc2ljV2lkdGhDb25zdHJhaW50cyA9IFsmXSB7 CiAgICAgICAgIC8vIEV2ZW4gZml4ZWQgd2lkdGggY2VsbHMgZXhwYW5kIHRvIHRoZWlyIG1pbmlt dW0gY29udGVudCB3aWR0aAogICAgICAgICAvLyA8dGQgc3R5bGU9IndpZHRoOiAxMHB4Ij50ZXN0 X2NvbnRlbnQ8L3RkPiB3aWxsIHNpemUgdG8gbWF4KG1pbmltdW0gY29udGVudCB3aWR0aCwgY29t cHV0ZWQgd2lkdGgpLgogICAgICAgICBhdXRvIGludHJpbnNpY1dpZHRoQ29uc3RyYWludHMgPSBG b3JtYXR0aW5nQ29udGV4dDo6SW50cmluc2ljV2lkdGhDb25zdHJhaW50cyB7IH07CiAgICAgICAg IGlmIChjZWxsQm94Lmhhc0NoaWxkKCkpCiAgICAgICAgICAgICBpbnRyaW5zaWNXaWR0aENvbnN0 cmFpbnRzID0gTGF5b3V0Q29udGV4dDo6Y3JlYXRlRm9ybWF0dGluZ0NvbnRleHQoY2VsbEJveCwg bGF5b3V0U3RhdGUoKSktPmNvbXB1dGVkSW50cmluc2ljV2lkdGhDb25zdHJhaW50cygpOwotICAg ICAgICBpZiAoYXV0byB3aWR0aCA9IGZpeGVkVmFsdWUoY2VsbEJveC5zdHlsZSgpLmxvZ2ljYWxX aWR0aCgpKSkKKyAgICAgICAgaWYgKGF1dG8gd2lkdGggPSBmaXhlZFZhbHVlKHN0eWxlLmxvZ2lj YWxXaWR0aCgpKSkKICAgICAgICAgICAgIHJldHVybiBGb3JtYXR0aW5nQ29udGV4dDo6SW50cmlu c2ljV2lkdGhDb25zdHJhaW50cyB7IHN0ZDo6bWF4KGludHJpbnNpY1dpZHRoQ29uc3RyYWludHMu bWluaW11bSwgKndpZHRoKSwgKndpZHRoIH07CiAgICAgICAgIHJldHVybiBpbnRyaW5zaWNXaWR0 aENvbnN0cmFpbnRzOwogICAgIH07CiAgICAgLy8gRklYTUUgQ2hlY2sgZm9yIGJveC1zaXppbmc6 IGJvcmRlci1ib3g7CiAgICAgYXV0byBpbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzID0gY29uc3Ry YWluQnlNaW5NYXhXaWR0aChjZWxsQm94LCBjb21wdXRlZEludHJpbnNpY1dpZHRoQ29uc3RyYWlu dHMoKSk7CiAgICAgLy8gRXhwYW5kIHdpdGggYm9yZGVyCi0gICAgaW50cmluc2ljV2lkdGhDb25z dHJhaW50cy5leHBhbmQoY29tcHV0ZWRIb3Jpem9udGFsQm9yZGVyKCkpOworICAgIGludHJpbnNp Y1dpZHRoQ29uc3RyYWludHMuZXhwYW5kKGNvbXB1dGVkQ2VsbEJvcmRlcihjZWxsKS5ob3Jpem9u dGFsLndpZHRoKCkpOwogICAgIC8vIHBhZGRpbmcKICAgICBpbnRyaW5zaWNXaWR0aENvbnN0cmFp bnRzLmV4cGFuZChmaXhlZFZhbHVlKHN0eWxlLnBhZGRpbmdMZWZ0KCkpLnZhbHVlT3IoMCkgKyBm aXhlZFZhbHVlKHN0eWxlLnBhZGRpbmdSaWdodCgpKS52YWx1ZU9yKDApKTsKICAgICAvLyBhbmQg bWFyZ2luCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKaW5kZXggZTUwMDZhODJlZjMzZjg2N2QzODFmMGIyODM2ZDYzOTUwMzRkNzQ5MS4u YTRiMDVmNWM4MDc4N2NjYjgxZTZhNDNhODUwZTY4NmU1NWNkMjhiYiAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsx LDEzIEBACisyMDIwLTA1LTIwICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAg ICAgICAgW0xGQ11bVEZDXSBDb2xsYXBzZSBpbi1iZXR3ZWVuIGNlbGwgYm9yZGVycworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEyMTgzCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L2xheW91dGZv cm1hdHRpbmdjb250ZXh0L3RhYmxlLXNpbXBsZS1ib3JkZXItY29sbGFwc2UzLWV4cGVjdGVkLmh0 bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvdGFibGUt c2ltcGxlLWJvcmRlci1jb2xsYXBzZTMuaHRtbDogQWRkZWQuCisKIDIwMjAtMDUtMjAgIFphbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtURkNdIFByZWZlcnJl ZCB3aWR0aCBjb21wdXRhdGlvbiBzaG91bGQgdGFrZSBib3JkZXIgY29sbGFwc2luZyBpbnRvIGFj Y291bnQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRl eHQvdGFibGUtc2ltcGxlLWJvcmRlci1jb2xsYXBzZTMtZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRl c3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvdGFibGUtc2ltcGxlLWJvcmRlci1jb2xs YXBzZTMtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi43MjEwNzI2NmM5NWYxYTcwYWMzMzE3NTlh MWZmN2I2MGJlZjMyYjNmCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9sYXlv dXRmb3JtYXR0aW5nY29udGV4dC90YWJsZS1zaW1wbGUtYm9yZGVyLWNvbGxhcHNlMy1leHBlY3Rl ZC5odG1sCkBAIC0wLDAgKzEsMTUgQEAKKzwhRE9DVFlQRSBodG1sPiA8IS0tIHdlYmtpdC10ZXN0 LXJ1bm5lciBbIGludGVybmFsOkxheW91dEZvcm1hdHRpbmdDb250ZXh0RW5hYmxlZD10cnVlIGlu dGVybmFsOkxheW91dEZvcm1hdHRpbmdDb250ZXh0SW50ZWdyYXRpb25FbmFibGVkPWZhbHNlIF0g LS0+Cis8c3R5bGU+CitkaXYgeworICAgIGhlaWdodDogMTBweDsKKyAgICB3aWR0aDogMTBweDsK KyAgICBib3JkZXI6IDBweCBzb2xpZCBncmVlbjsKKyAgICBwb3NpdGlvbjogYWJzb2x1dGU7Cit9 Cis8L3N0eWxlPgorPGRpdiBzdHlsZT0iYm9yZGVyLXdpZHRoOiAyMHB4IDVweCAxcHggMjBweDsg aGVpZ2h0OiAxNHB4OyI+PC9kaXY+Cis8ZGl2IHN0eWxlPSJ0b3A6IDhweDsgbGVmdDogNDNweDsg Ym9yZGVyLXdpZHRoOiAyMHB4IDVweCA1cHggNXB4OyI+PC9kaXY+Cis8ZGl2IHN0eWxlPSJ0b3A6 IDhweDsgbGVmdDogNjNweDsgYm9yZGVyLXdpZHRoOiAyMHB4IDIwcHggMXB4IDVweDsgaGVpZ2h0 OiAxNHB4OyI+PC9kaXY+Cis8ZGl2IHN0eWxlPSJ0b3A6IDQzcHg7IGxlZnQ6IDhweDsgYm9yZGVy LXdpZHRoOiAxcHggNXB4IDIwcHggMjBweDsgaGVpZ2h0OiAxNHB4OyI+PC9kaXY+Cis8ZGl2IHN0 eWxlPSJ0b3A6IDQzcHg7IGxlZnQ6IDQzcHg7IGJvcmRlci13aWR0aDogNXB4IDVweCAyMHB4IDVw eDsiPjwvZGl2PgorPGRpdiBzdHlsZT0idG9wOiA0M3B4OyBsZWZ0OiA2M3B4OyBib3JkZXItd2lk dGg6IDFweCAyMHB4IDIwcHggNXB4OyBoZWlnaHQ6IDE0cHg7Ij48L2Rpdj4KZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2NvbnRleHQvdGFibGUtc2ltcGxlLWJv cmRlci1jb2xsYXBzZTMuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbGF5b3V0Zm9ybWF0dGluZ2Nv bnRleHQvdGFibGUtc2ltcGxlLWJvcmRlci1jb2xsYXBzZTMuaHRtbApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wMDI3 NGRlNGMxNzhiNzYxNGRiZjJiODE0MWNmNjg1OGNkNjQyMzE0Ci0tLSAvZGV2L251bGwKKysrIGIv TGF5b3V0VGVzdHMvZmFzdC9sYXlvdXRmb3JtYXR0aW5nY29udGV4dC90YWJsZS1zaW1wbGUtYm9y ZGVyLWNvbGxhcHNlMy5odG1sCkBAIC0wLDAgKzEsMTkgQEAKKzwhRE9DVFlQRSBodG1sPiA8IS0t IHdlYmtpdC10ZXN0LXJ1bm5lciBbIGludGVybmFsOkxheW91dEZvcm1hdHRpbmdDb250ZXh0RW5h YmxlZD10cnVlIGludGVybmFsOkxheW91dEZvcm1hdHRpbmdDb250ZXh0SW50ZWdyYXRpb25FbmFi bGVkPWZhbHNlIF0gLS0+Cis8c3R5bGU+Cit0YWJsZSB7CisgICAgYm9yZGVyLWNvbGxhcHNlOiBj b2xsYXBzZTsKKyAgICBib3JkZXI6IDIwcHggc29saWQgZ3JlZW47Cit9CisKK3RkIHsKKyAgICB3 aWR0aDogMTBweDsKKyAgICBoZWlnaHQ6IDEwcHg7CisgICAgYm9yZGVyOiAycHggc29saWQgZ3Jl ZW47CisgICAgcGFkZGluZzogMHB4OworfQorPC9zdHlsZT4KKzx0YWJsZT4KKzx0cj48dGQ+PC90 ZD48dGQgc3R5bGU9ImJvcmRlci13aWR0aDogMTBweCI+PC90ZD48dGQ+PC90ZD48L3RyPgorPHRy Pjx0ZD48L3RkPjx0ZCBzdHlsZT0iYm9yZGVyLXdpZHRoOiAxMHB4Ij48L3RkPjx0ZD48L3RkPjwv dHI+Cis8L3Rib2R5PgorPC90YWJsZT4K