202319 2019-09-27 10:14:50 -0700 [LFC][IFC] Line::close should merge the text runs. 2019-09-27 12:26:01 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1574860 0 zalan 2019-09-27 10:14:50 -0700 when possible. 1574861 1 webkit-bug-importer 2019-09-27 10:15:11 -0700 <rdar://problem/55785949> 1574865 2 379736 zalan 2019-09-27 10:22:14 -0700 Created attachment 379736 Patch 1574923 3 379736 commit-queue 2019-09-27 12:25:59 -0700 Comment on attachment 379736 Patch Clearing flags on attachment: 379736 Committed r250439: <https://trac.webkit.org/changeset/250439> 1574924 4 commit-queue 2019-09-27 12:26:01 -0700 All reviewed patches have been landed. Closing bug. 379736 2019-09-27 10:22:14 -0700 2019-09-27 12:25:59 -0700 Patch bug-202319-20190927102214.patch text/plain 11128 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwNDIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTdkM2RmNTU5NWE2ODQ1 MDU5OWRkNDVkY2QwZWIzNjEzYzNhMDc4MC4uOWQzMzVlM2VlZWQ0ZWU5ZThkMTczNjMxM2IxZTQz Y2U0ZGFlMGU0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE5LTA5LTI3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBMaW5lOjpj bG9zZSBzaG91bGQgbWVyZ2UgdGhlIHRleHQgcnVucy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMjMxOQorICAgICAgICA8cmRhcjovL3Byb2JsZW0v NTU3ODU5NDk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgTm93IExpbmU6OmNsb3NlIHJldHVybnMgdGhlIGZpbmFsIERpc3BsYXk6OlJ1biBsaXN0Lgor CisgICAgICAgICogbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlSZWN0Lmg6CisgICAgICAgIChX ZWJDb3JlOjpEaXNwbGF5OjpSZWN0OjpleHBhbmRIb3Jpem9udGFsbHkpOgorICAgICAgICAoV2Vi Q29yZTo6RGlzcGxheTo6UmVjdDo6ZXhwYW5kVmVydGljYWxseSk6CisgICAgICAgIChXZWJDb3Jl OjpEaXNwbGF5OjpSZWN0OjpleHBhbmQpOgorICAgICAgICAqIGxheW91dC9kaXNwbGF5dHJlZS9E aXNwbGF5UnVuLmg6CisgICAgICAgIChXZWJDb3JlOjpEaXNwbGF5OjpSdW46OmV4cGFuZFZlcnRp Y2FsbHkpOgorICAgICAgICAoV2ViQ29yZTo6RGlzcGxheTo6UnVuOjpleHBhbmRIb3Jpem9udGFs bHkpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdD b250ZXh0TGluZUxheW91dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZv cm1hdHRpbmdDb250ZXh0OjpJbmxpbmVMYXlvdXQ6OmNyZWF0ZURpc3BsYXlSdW5zKToKKyAgICAg ICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6TGluZTo6Y2xvc2UpOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6UnVu OjpkaXNwbGF5UnVuKToKKwogMjAxOS0wOS0yNyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUu Y29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gUmVwbGFjZSBMaW5lOjpSdW4ncyBsb2dpY2FsUmVj dC90ZXh0Q29udGV4dCB3aXRoIERpc3BsYXk6OlJ1bgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlSZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZGlzcGxheXRyZWUvRGlzcGxheVJlY3QuaAppbmRleCBiZDJkNzlhMzZmNjk5OWJmNmFiNmFj NzJiMzdkZmJmODNlZWY2ODhmLi43N2U1OTIwYjdjMzM0YTU2NmExNmM0YWZmM2UwMWYzOTU1MjZl MTRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxh eVJlY3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZGlzcGxheXRyZWUvRGlzcGxheVJl Y3QuaApAQCAtNjgsOSArNjgsOSBAQCBwdWJsaWM6CiAgICAgdm9pZCBtb3ZlSG9yaXpvbnRhbGx5 KExheW91dFVuaXQpOwogICAgIHZvaWQgbW92ZVZlcnRpY2FsbHkoTGF5b3V0VW5pdCk7CiAKLSAg ICB2b2lkIGV4cGFuZChMYXlvdXRVbml0LCBMYXlvdXRVbml0KTsKLSAgICB2b2lkIGV4cGFuZEhv cml6b250YWxseShMYXlvdXRVbml0IGRlbHRhKSB7IGV4cGFuZChkZWx0YSwgMCk7IH0KLSAgICB2 b2lkIGV4cGFuZFZlcnRpY2FsbHkoTGF5b3V0VW5pdCBkZWx0YSkgeyBleHBhbmQoMCwgZGVsdGEp OyB9CisgICAgdm9pZCBleHBhbmQoT3B0aW9uYWw8TGF5b3V0VW5pdD4sIE9wdGlvbmFsPExheW91 dFVuaXQ+KTsKKyAgICB2b2lkIGV4cGFuZEhvcml6b250YWxseShMYXlvdXRVbml0IGRlbHRhKSB7 IGV4cGFuZChkZWx0YSwgeyB9KTsgfQorICAgIHZvaWQgZXhwYW5kVmVydGljYWxseShMYXlvdXRV bml0IGRlbHRhKSB7IGV4cGFuZCh7IH0sIGRlbHRhKTsgfQogICAgIGJvb2wgaW50ZXJzZWN0cyhj b25zdCBSZWN0JiByZWN0KSBjb25zdCB7IHJldHVybiBtX3JlY3QuaW50ZXJzZWN0cyhyZWN0KTsg fQogCiAgICAgUmVjdCBjbG9uZSgpIGNvbnN0OwpAQCAtMjczLDEwICsyNzMsMTEgQEAgaW5saW5l IHZvaWQgUmVjdDo6bW92ZVZlcnRpY2FsbHkoTGF5b3V0VW5pdCBvZmZzZXQpCiAgICAgbV9yZWN0 Lm1vdmUoTGF5b3V0U2l6ZSB7IDAsIG9mZnNldCB9KTsKIH0KIAotaW5saW5lIHZvaWQgUmVjdDo6 ZXhwYW5kKExheW91dFVuaXQgd2lkdGgsIExheW91dFVuaXQgaGVpZ2h0KQoraW5saW5lIHZvaWQg UmVjdDo6ZXhwYW5kKE9wdGlvbmFsPExheW91dFVuaXQ+IHdpZHRoLCBPcHRpb25hbDxMYXlvdXRV bml0PiBoZWlnaHQpCiB7Ci0gICAgQVNTRVJUKGhhc1ZhbGlkR2VvbWV0cnkoKSk7Ci0gICAgbV9y ZWN0LmV4cGFuZCh3aWR0aCwgaGVpZ2h0KTsKKyAgICBBU1NFUlQoIXdpZHRoIHx8IG1faGFzVmFs aWRXaWR0aCk7CisgICAgQVNTRVJUKCFoZWlnaHQgfHwgbV9oYXNWYWxpZEhlaWdodCk7CisgICAg bV9yZWN0LmV4cGFuZCh3aWR0aC52YWx1ZU9yKDApLCBoZWlnaHQudmFsdWVPcigwKSk7CiB9CiAK IGlubGluZSBSZWN0IFJlY3Q6OmNsb25lKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5UnVuLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZGlzcGxheXRyZWUvRGlzcGxheVJ1bi5oCmluZGV4IDJkYTcxZGNjZDhiOTRkYzhhZjRiYjc4 NjY0MWE2OTZmMDNmMzk2MWQuLmVmMGMwNGYyNGY1NDNmYjYyMTM3NWZiYTRiYWE1OWJmYjgzYWVi NDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9kaXNwbGF5dHJlZS9EaXNwbGF5 UnVuLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlSdW4u aApAQCAtNzQsOCArNzQsOCBAQCBzdHJ1Y3QgUnVuIHsKICAgICB2b2lkIHNldExvZ2ljYWxSaWdo dChMYXlvdXRVbml0IGxvZ2ljYWxSaWdodCkgeyBtX2xvZ2ljYWxSZWN0LnNoaWZ0UmlnaHRUbyhs b2dpY2FsUmlnaHQpOyB9CiAgICAgdm9pZCBtb3ZlVmVydGljYWxseShMYXlvdXRVbml0IGRlbHRh KSB7IG1fbG9naWNhbFJlY3QubW92ZVZlcnRpY2FsbHkoZGVsdGEpOyB9CiAgICAgdm9pZCBtb3Zl SG9yaXpvbnRhbGx5KExheW91dFVuaXQgZGVsdGEpIHsgbV9sb2dpY2FsUmVjdC5tb3ZlSG9yaXpv bnRhbGx5KGRlbHRhKTsgfQotICAgIHZvaWQgZXhwYW5kVmVydGljYWxseShMYXlvdXRVbml0IGRl bHRhKSB7IG1fbG9naWNhbFJlY3QuZXhwYW5kKDAsIGRlbHRhKTsgfQotICAgIHZvaWQgZXhwYW5k SG9yaXpvbnRhbGx5KExheW91dFVuaXQgZGVsdGEpIHsgbV9sb2dpY2FsUmVjdC5leHBhbmQoZGVs dGEsIDApOyB9CisgICAgdm9pZCBleHBhbmRWZXJ0aWNhbGx5KExheW91dFVuaXQgZGVsdGEpIHsg bV9sb2dpY2FsUmVjdC5leHBhbmRWZXJ0aWNhbGx5KGRlbHRhKTsgfQorICAgIHZvaWQgZXhwYW5k SG9yaXpvbnRhbGx5KExheW91dFVuaXQgZGVsdGEpIHsgbV9sb2dpY2FsUmVjdC5leHBhbmRIb3Jp em9udGFsbHkoZGVsdGEpOyB9CiAKICAgICB2b2lkIHNldFRleHRDb250ZXh0KFRleHRDb250ZXh0 IHRleHRDb250ZXh0KSB7IG1fdGV4dENvbnRleHQuZW1wbGFjZSh0ZXh0Q29udGV4dCk7IH0KICAg ICBPcHRpb25hbDxUZXh0Q29udGV4dD4mIHRleHRDb250ZXh0KCkgeyByZXR1cm4gbV90ZXh0Q29u dGV4dDsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggNjA3YjE2YjlmODMy YjExZjE4MTc5NTJlNDNlNTA5ZTgyNjZmODI5ZC4uZWY3NmI3ZTA3ZDRlZWYxMzM5MDY5MjBhY2M4 ZWE5OWE3Zjg0NzgwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oCkBAIC02Nyw3 ICs2Nyw3IEBAIHByaXZhdGU6CiAgICAgICAgIExheW91dFVuaXQgd2lkdGhDb25zdHJhaW50KCkg Y29uc3QgeyByZXR1cm4gbV91c2VkSG9yaXpvbnRhbFZhbHVlcy5jb25zdHJhaW50cy53aWR0aDsg fQogCiAgICAgICAgIExpbmVDb250ZW50IHBsYWNlSW5saW5lSXRlbXMoY29uc3QgTGluZUlucHV0 JikgY29uc3Q7Ci0gICAgICAgIHZvaWQgY3JlYXRlRGlzcGxheVJ1bnMoY29uc3QgTGluZUNvbnRl bnQmKTsKKyAgICAgICAgdm9pZCBzZXR1cERpc3BsYXlCb3hlcyhjb25zdCBMaW5lQ29udGVudCYp OwogICAgICAgICB2b2lkIGFsaWduUnVucyhUZXh0QWxpZ25Nb2RlLCBJbmxpbmVSdW5zJiwgdW5z aWduZWQgZmlyc3RSdW5JbmRleCwgTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCkgY29uc3Q7CiAK ICAgICBwcml2YXRlOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZv cm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRMaW5lTGF5b3V0LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0TGlu ZUxheW91dC5jcHAKaW5kZXggZWZmMjMyZTgxNGYwNmQxZTdhYjUwNjFlNGM3ZGVkZWYwYzM2Yjdj Ni4uOTU3ZTkwMWMwMGI4M2E5Y2EwNGFhYWU0YzQxYWEyYWNkMjU1M2EyNiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0Nv bnRleHRMaW5lTGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQuY3BwCkBAIC0yODUsNyAr Mjg1LDcgQEAgdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6SW5saW5lTGF5b3V0OjpsYXlv dXQoY29uc3QgSW5saW5lSXRlbXMmIGlubGluZUl0ZW0KICAgICAgICAgYXV0byBsaW5lTGF5b3V0 ID0gTGluZUxheW91dCB7IGZvcm1hdHRpbmdDb250ZXh0KCksIGxpbmVJbnB1dCB9OwogCiAgICAg ICAgIGF1dG8gbGluZUNvbnRlbnQgPSBsaW5lTGF5b3V0LmxheW91dCgpOwotICAgICAgICBjcmVh dGVEaXNwbGF5UnVucyhsaW5lQ29udGVudCk7CisgICAgICAgIHNldHVwRGlzcGxheUJveGVzKGxp bmVDb250ZW50KTsKIAogICAgICAgICBpZiAobGluZUNvbnRlbnQubGFzdENvbW1pdHRlZCkgewog ICAgICAgICAgICAgY3VycmVudElubGluZUl0ZW0gPSB7IGxpbmVDb250ZW50Lmxhc3RDb21taXR0 ZWQtPmluZGV4ICsgMSwgV1RGOjpudWxsb3B0IH07CkBAIC0zNTgsNyArMzU4LDcgQEAgTGF5b3V0 VW5pdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6SW5saW5lTGF5b3V0Ojpjb21wdXRlZEludHJp bnNpY1dpZHRoKGNvbnN0IEkKICAgICByZXR1cm4gbWF4aW11bUxpbmVXaWR0aDsKIH0KIAotdm9p ZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6SW5saW5lTGF5b3V0OjpjcmVhdGVEaXNwbGF5UnVu cyhjb25zdCBMaW5lQ29udGVudCYgbGluZUNvbnRlbnQpCit2b2lkIElubGluZUZvcm1hdHRpbmdD b250ZXh0OjpJbmxpbmVMYXlvdXQ6OnNldHVwRGlzcGxheUJveGVzKGNvbnN0IExpbmVDb250ZW50 JiBsaW5lQ29udGVudCkKIHsKICAgICBhdXRvJiBmb3JtYXR0aW5nQ29udGV4dCA9IHRoaXMtPmZv cm1hdHRpbmdDb250ZXh0KCk7CiAgICAgYXV0byYgZm9ybWF0dGluZ1N0YXRlID0gdGhpcy0+Zm9y bWF0dGluZ1N0YXRlKCk7CkBAIC0zODEsNDAgKzM4MSwxNiBAQCB2b2lkIElubGluZUZvcm1hdHRp bmdDb250ZXh0OjpJbmxpbmVMYXlvdXQ6OmNyZWF0ZURpc3BsYXlSdW5zKGNvbnN0IExpbmVDb250 ZW50JgogICAgIC8vIDkuNC4yIElubGluZSBmb3JtYXR0aW5nIGNvbnRleHRzCiAgICAgLy8gQSBs aW5lIGJveCBpcyBhbHdheXMgdGFsbCBlbm91Z2ggZm9yIGFsbCBvZiB0aGUgYm94ZXMgaXQgY29u dGFpbnMuCiAKLSAgICAvLyBDcmVhdGUgZmluYWwgZGlzcGxheSBydW5zLgotICAgIGF1dG8mIGxp bmVSdW5zID0gbGluZUNvbnRlbnQucnVuTGlzdDsKLSAgICBmb3IgKHVuc2lnbmVkIGluZGV4ID0g MDsgaW5kZXggPCBsaW5lUnVucy5zaXplKCk7ICsraW5kZXgpIHsKLSAgICAgICAgYXV0byYgcnVu ID0gbGluZVJ1bnMuYXQoaW5kZXgpOworICAgIC8vIEFkZCBmaW5hbCBkaXNwbGF5IHJ1bnMgdG8g c3RhdGUuCisgICAgZm9yIChhdXRvJiBsaW5lUnVuIDogbGluZUNvbnRlbnQucnVuTGlzdCkgewog ICAgICAgICAvLyBJbmxpbmUgbGV2ZWwgY29udGFpbmVycyAoPHNwYW4+KSBkb24ndCBnZW5lcmF0 ZSBpbmxpbmUgcnVucy4KLSAgICAgICAgaWYgKHJ1bi0+aXNDb250YWluZXJTdGFydCgpIHx8IHJ1 bi0+aXNDb250YWluZXJFbmQoKSkKLSAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICBhdXRv JiBsb2dpY2FsUmVjdCA9IHJ1bi0+bG9naWNhbFJlY3QoKTsKLSAgICAgICAgLy8gSW5saW5lIGxl dmVsIGJveCAocmVwbGFjZWQgb3IgaW5saW5lLWJsb2NrKSBvciA8YnI+Lzx3YnI+Ci0gICAgICAg IGlmIChydW4tPmlzTGluZUJyZWFrKCkgfHwgcnVuLT5pc0JveCgpKSB7Ci0gICAgICAgICAgICBm b3JtYXR0aW5nU3RhdGUuYWRkSW5saW5lUnVuKHJ1bi0+ZGlzcGxheVJ1bigpKTsKLSAgICAgICAg ICAgIGNvbnRpbnVlOwotICAgICAgICB9Ci0gICAgICAgIGlmIChydW4tPmlzVGV4dCgpKSB7Ci0g ICAgICAgICAgICAvLyBDb2xsYXBzZWQgbGluZSBydW5zIGRvbid0IGdlbmVyYXRlIGRpc3BsYXkg cnVucy4KLSAgICAgICAgICAgIGlmIChydW4tPmlzVmlzdWFsbHlFbXB0eSgpKQotICAgICAgICAg ICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgLy8gVHJ5IHRvIGpvaW4gbXVsdGlwbGUgdGV4 dCBydW5zIHdoZW4gcG9zc2libGUuCi0gICAgICAgICAgICBjb25zdCBMaW5lOjpSdW4qIHByZXZp b3VzUnVuID0gIWluZGV4ID8gbnVsbHB0ciA6IGxpbmVSdW5zW2luZGV4IC0gMV0uZ2V0KCk7Ci0g ICAgICAgICAgICBhdXRvIHByZXZpb3VzUnVuQ2FuQmVFeHRlbmRlZCA9IHByZXZpb3VzUnVuICYm IHByZXZpb3VzUnVuLT5jYW5CZUV4dGVuZGVkKCk7Ci0gICAgICAgICAgICBhdXRvIGN1cnJlbnRS dW5DYW5CZU1lcmdlZFdpdGhQcmV2aW91cyA9ICFwcmV2aW91c1J1biB8fCAmcnVuLT5sYXlvdXRC b3goKSA9PSAmcHJldmlvdXNSdW4tPmxheW91dEJveCgpOwotCi0gICAgICAgICAgICBpZiAocHJl dmlvdXNSdW5DYW5CZUV4dGVuZGVkICYmIGN1cnJlbnRSdW5DYW5CZU1lcmdlZFdpdGhQcmV2aW91 cykgewotICAgICAgICAgICAgICAgIGF1dG8mIHByZXZpb3VzRGlzcGxheVJ1biA9IGZvcm1hdHRp bmdTdGF0ZS5pbmxpbmVSdW5zKCkubGFzdCgpOwotICAgICAgICAgICAgICAgIHByZXZpb3VzRGlz cGxheVJ1bi5leHBhbmRIb3Jpem9udGFsbHkobG9naWNhbFJlY3Qud2lkdGgoKSk7Ci0gICAgICAg ICAgICAgICAgcHJldmlvdXNEaXNwbGF5UnVuLnRleHRDb250ZXh0KCktPmV4cGFuZChydW4tPmRp c3BsYXlSdW4oKS50ZXh0Q29udGV4dCgpLT5sZW5ndGgoKSk7Ci0gICAgICAgICAgICB9IGVsc2UK LSAgICAgICAgICAgICAgICBmb3JtYXR0aW5nU3RhdGUuYWRkSW5saW5lUnVuKHJ1bi0+ZGlzcGxh eVJ1bigpKTsKKyAgICAgICAgaWYgKGxpbmVSdW4tPmlzQ29udGFpbmVyU3RhcnQoKSB8fCBsaW5l UnVuLT5pc0NvbnRhaW5lckVuZCgpKQogICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgIH0K LSAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisgICAgICAgIGZvcm1hdHRpbmdTdGF0ZS5h ZGRJbmxpbmVSdW4obGluZVJ1bi0+ZGlzcGxheVJ1bigpKTsKICAgICB9CiAKICAgICBhdXRvIGdl b21ldHJ5ID0gZm9ybWF0dGluZ0NvbnRleHQuZ2VvbWV0cnkoKTsKKyAgICBhdXRvJiBsaW5lUnVu cyA9IGxpbmVDb250ZW50LnJ1bkxpc3Q7CiAgICAgZm9yICh1bnNpZ25lZCBpbmRleCA9IDA7IGlu ZGV4IDwgbGluZVJ1bnMuc2l6ZSgpOyArK2luZGV4KSB7CiAgICAgICAgIGF1dG8mIGxpbmVSdW4g PSBsaW5lUnVucy5hdChpbmRleCk7CiAgICAgICAgIGF1dG8mIGxvZ2ljYWxSZWN0ID0gbGluZVJ1 bi0+bG9naWNhbFJlY3QoKTsKQEAgLTQ1OCw3ICs0MzQsNiBAQCB2b2lkIElubGluZUZvcm1hdHRp bmdDb250ZXh0OjpJbmxpbmVMYXlvdXQ6OmNyZWF0ZURpc3BsYXlSdW5zKGNvbnN0IExpbmVDb250 ZW50JgogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KIAotICAgICAgICAvLyBUZXh0 IGNvbnRlbnQuIFRyeSB0byBqb2luIG11bHRpcGxlIHRleHQgcnVucyB3aGVuIHBvc3NpYmxlLgog ICAgICAgICBpZiAobGluZVJ1bi0+aXNUZXh0KCkpIHsKICAgICAgICAgICAgIGNvbnN0IExpbmU6 OlJ1biogcHJldmlvdXNMaW5lUnVuID0gIWluZGV4ID8gbnVsbHB0ciA6IGxpbmVSdW5zW2luZGV4 IC0gMV0uZ2V0KCk7CiAgICAgICAgICAgICAvLyBGSVhNRSB0YWtlIGNvbnRlbnQgYnJlYWtpbmcg aW50byBhY2NvdW50IHdoZW4gcGFydCBvZiB0aGUgbGF5b3V0IGJveCBpcyBvbiB0aGUgcHJldmlv dXMgbGluZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUxpbmUuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lTGluZS5jcHAKaW5kZXggZDNhYTNjZTg3ZmQ5YjJiMTZlMmY0NWQxZTA5M2Q5MTNl ODM1ZjQzNi4uMTJmODAyMTU1Y2Y3NTFlMDFiZGJmNjA2MzZlM2NiMjk1ODdiZWZhZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGlu ZS5jcHAKQEAgLTE1OSw2ICsxNTksMzEgQEAgTGluZTo6UnVuTGlzdCBMaW5lOjpjbG9zZSgpCiAg ICAgICAgICAgICBydW4tPm1vdmVIb3Jpem9udGFsbHkodGhpcy0+bG9naWNhbExlZnQoKSk7CiAg ICAgICAgIH0KICAgICB9CisKKyAgICAvLyBMZXQncyBqb2luIHRleHQgcnVucyB0b2dldGhlciB3 aGVuIHBvc3NpYmxlLgorICAgIC8vIEZJWE1FOiBDaGVjayBpZiB3ZSBjYW4gZG8gaXQgYXMgcGFy dCBvZiB0aGUgbG9vcCBhYm92ZS4KKyAgICB1bnNpZ25lZCBpbmRleCA9IDE7CisgICAgd2hpbGUg KGluZGV4IDwgbV9ydW5MaXN0LnNpemUoKSkgeworICAgICAgICBhdXRvJiBwcmV2aW91c1J1biA9 IG1fcnVuTGlzdFtpbmRleCAtIDFdOworICAgICAgICBpZiAoIXByZXZpb3VzUnVuLT5jYW5CZUV4 dGVuZGVkKCkpIHsKKyAgICAgICAgICAgICsraW5kZXg7CisgICAgICAgICAgICBjb250aW51ZTsK KyAgICAgICAgfQorICAgICAgICBhdXRvJiBjdXJyZW50UnVuID0gbV9ydW5MaXN0W2luZGV4XTsK KyAgICAgICAgaWYgKCZjdXJyZW50UnVuLT5sYXlvdXRCb3goKSAhPSAmcHJldmlvdXNSdW4tPmxh eW91dEJveCgpKSB7CisgICAgICAgICAgICAvLyBEbyBub3QgbWVyZ2UgcnVucyBmcm9tIGRpZmZl cmVudCBib3hlcyAoPHNwYW4+Zm9vPC9zcGFuPjxzcGFuPmJhcjwvc3Bhbj4pLgorICAgICAgICAg ICAgKytpbmRleDsKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CisgICAgICAgIC8v IE9ubHkgdGV4dCBjb250ZW50IGNhbiBiZSBleHRlbmRlZCBhdG0uCisgICAgICAgIEFTU0VSVChw cmV2aW91c1J1bi0+aXNUZXh0KCkpOworICAgICAgICBBU1NFUlQoY3VycmVudFJ1bi0+aXNUZXh0 KCkpOworICAgICAgICBhdXRvJiBwcmV2aW91c0Rpc3BsYXlSdW4gPSBwcmV2aW91c1J1bi0+ZGlz cGxheVJ1bigpOworICAgICAgICBhdXRvJiBjdXJyZW50RGlzcGxheVJ1biA9IGN1cnJlbnRSdW4t PmRpc3BsYXlSdW4oKTsKKyAgICAgICAgcHJldmlvdXNEaXNwbGF5UnVuLmV4cGFuZEhvcml6b250 YWxseShjdXJyZW50RGlzcGxheVJ1bi5sb2dpY2FsV2lkdGgoKSk7CisgICAgICAgIHByZXZpb3Vz RGlzcGxheVJ1bi50ZXh0Q29udGV4dCgpLT5leHBhbmQoY3VycmVudERpc3BsYXlSdW4udGV4dENv bnRleHQoKS0+bGVuZ3RoKCkpOworICAgICAgICBtX3J1bkxpc3QucmVtb3ZlKGluZGV4KTsKKyAg ICB9CiAgICAgcmV0dXJuIFdURk1vdmUobV9ydW5MaXN0KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oCmluZGV4IDIyNWQ0 YWViZTA0NmJiMTI0YmE0YzViNmZlYTc3NzI1NzIzZTQ4ZjEuLjFhNmJlZDE2MzM4MDJjOWFmNTVm MmNhZmFjOGRkMGFkYTI0NDhmZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9p bmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmgKQEAgLTY5LDYgKzY5LDcgQEAgcHVibGljOgog ICAgICAgICBSdW4oY29uc3QgSW5saW5lSXRlbSYsIGNvbnN0IERpc3BsYXk6OlJ1biYpOwogCiAg ICAgICAgIGNvbnN0IERpc3BsYXk6OlJ1biYgZGlzcGxheVJ1bigpIGNvbnN0IHsgcmV0dXJuIG1f ZGlzcGxheVJ1bjsgfQorICAgICAgICBEaXNwbGF5OjpSdW4mIGRpc3BsYXlSdW4oKSB7IHJldHVy biBtX2Rpc3BsYXlSdW47IH0KICAgICAgICAgY29uc3QgQm94JiBsYXlvdXRCb3goKSBjb25zdCB7 IHJldHVybiBtX2lubGluZUl0ZW0ubGF5b3V0Qm94KCk7IH0KIAogICAgICAgICBjb25zdCBEaXNw bGF5OjpSZWN0JiBsb2dpY2FsUmVjdCgpIGNvbnN0IHsgcmV0dXJuIG1fZGlzcGxheVJ1bi5sb2dp Y2FsUmVjdCgpOyB9Cg==