219695 2020-12-09 09:19:35 -0800 [LFC][IFC] Introduce InlineTextItem::isWordSeparator 2020-12-10 09:59:26 -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 1713193 0 zalan 2020-12-09 09:19:35 -0800 This is in preparation for using it for word-spacing. 1713194 1 415769 zalan 2020-12-09 09:21:34 -0800 Created attachment 415769 Patch 1713579 2 ews-feeder 2020-12-10 09:58:03 -0800 Committed r270630: <https://trac.webkit.org/changeset/270630> All reviewed patches have been landed. Closing bug and clearing flags on attachment 415769. 1713582 3 webkit-bug-importer 2020-12-10 09:59:26 -0800 <rdar://problem/72185314> 415769 2020-12-09 09:21:34 -0800 2020-12-10 09:58:04 -0800 Patch bug-219695-20201209092134.patch text/plain 9224 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcwNTM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjgxNTkyZmJiNzZiMzI5 NDZmMTQxNGVkMTQ1NmY0MTM3NWJjYjhiMC4uNmYyZTkzMjM5NTFlMDExYTcxMTZmYTczY2RhZGRj NDZmMjU0NGY3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTEyLTA5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBJbnRyb2R1 Y2UgSW5saW5lVGV4dEl0ZW06OmlzV29yZFNlcGFyYXRvcgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE5Njk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBpcyBpbiBwcmVwYXJhdGlvbiBmb3IgdXNp bmcgaXQgdG8gbWFrZSBzcGFjZSBmb3Igd29yZC1zcGFjaW5nLgorCisgICAgICAgICogbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lSXRlbS5jcHA6CisgICAgICAgICogbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lSXRlbS5oOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZVRleHRJdGVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5l VGV4dEl0ZW06OmNyZWF0ZUFuZEFwcGVuZFRleHRJdGVtcyk6CisgICAgICAgICogbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lVGV4dEl0ZW0uaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6SW5saW5lVGV4dEl0ZW06OmlzV29yZFNlcGFyYXRvciBjb25zdCk6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OklubGluZVRleHRJdGVtOjpjcmVhdGVXaGl0ZXNwYWNlSXRlbSk6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZVRleHRJdGVtOjpjcmVhdGVOb25XaGl0ZXNwYWNl SXRlbSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZVRleHRJdGVtOjpJbmxpbmVU ZXh0SXRlbSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZVRleHRJdGVtOjpsZWZ0 IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lVGV4dEl0ZW06OnJpZ2h0 IGNvbnN0KToKKwogMjAyMC0xMi0wOSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgog CiAgICAgICAgIFtMRkNdW0lGQ10gTGluZSBhdmFpbGFibGUgd2lkdGggY29tcHV0YXRpb24gc2hv dWxkIGJlIGJhc2VkIG9uIHRoZSBjb250ZW50IGxvZ2ljYWwgcmlnaHQuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVJdGVtLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUl0ZW0uY3BwCmluZGV4 IGE3ZWZkOWU4MmE3ZjFkOGY1NDMxNWFlMzhmMmY5MDBiMjI1YzUwNGQuLjcyYjUwYmFlMTM1MWEy YmIwODJkYTBjOTk4NzcyMDQ0MzQ2YmVlNDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUl0ZW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUl0ZW0uY3BwCkBAIC00MCw2ICs0MCw3IEBA IHN0cnVjdCBTYW1lU2l6ZUFzSW5saW5lSXRlbSB7CiAgICAgYm9vbCB3aWR0aEJvb2w7CiAgICAg Ym9vbCBzb2Z0SHlwaGVuQm9vbDsKICAgICBib29sIGlzQ29sbGFwc2libGU7CisgICAgYm9vbCBp c1dvcmRTZXBhcmF0b3I7CiAgICAgSW5saW5lTGF5b3V0VW5pdCB3aWR0aDsKICAgICB1bnNpZ25l ZCBzdGFydDsKICAgICB1bnNpZ25lZCBsZW5ndGg7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVJdGVtLmggYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVJdGVtLmgKaW5kZXggNmM5YTM1MTljNWUxMGNh NWZjMmE0MTRlNjE2YWVkYTAzZmMzNWQ3MC4uMDM0NTdiNGRiMDBlNTU5MjQ3YTM1ODhhMmU0MGE3 Njg2NzQ4MmIzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lSXRlbS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUl0ZW0uaApAQCAtNjMsNiArNjMsNyBAQCBwcm90ZWN0ZWQ6CiAgICAgYm9v bCBtX2hhc1dpZHRoIHsgZmFsc2UgfTsKICAgICBib29sIG1faGFzVHJhaWxpbmdTb2Z0SHlwaGVu IHsgZmFsc2UgfTsKICAgICBib29sIG1faXNDb2xsYXBzaWJsZSB7IGZhbHNlIH07CisgICAgYm9v bCBtX2lzV29yZFNlcGFyYXRvciB7IGZhbHNlIH07CiAgICAgSW5saW5lTGF5b3V0VW5pdCBtX3dp ZHRoIHsgfTsKICAgICB1bnNpZ25lZCBtX2xlbmd0aCB7IDAgfTsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lVGV4dEl0ZW0uY3BwIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lVGV4dEl0ZW0uY3Bw CmluZGV4IDQ0NTExODQ5ZmY5YjYxOWQyZjdlYWVjYTIyNTdhNDNmODhlNTEwNjcuLmJmMmJlNTIx ZmY5NWFlNmYyZWQ0ZjM0NjJhMmRlODBlNmQ3ZTBkMGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZVRleHRJdGVtLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVUZXh0SXRlbS5jcHAKQEAg LTk4LDcgKzk4LDE3IEBAIHZvaWQgSW5saW5lVGV4dEl0ZW06OmNyZWF0ZUFuZEFwcGVuZFRleHRJ dGVtcyhJbmxpbmVJdGVtcyYgaW5saW5lQ29udGVudCwgY29uc3QKICAgICAgICAgICAgIGF1dG8g YXBwZW5kV2hpdGVzcGFjZUl0ZW0gPSBbJl0gKGF1dG8gc3RhcnRQb3NpdGlvbiwgYXV0byBpdGVt TGVuZ3RoKSB7CiAgICAgICAgICAgICAgICAgYXV0byBzaW1wbGVTaW5nbGVXaGl0ZXNwYWNlQ29u dGVudCA9IGlubGluZVRleHRCb3guY2FuVXNlU2ltcGxpZmllZENvbnRlbnRNZWFzdXJpbmcoKSAm JiAoaXRlbUxlbmd0aCA9PSAxIHx8IHN0eWxlLmNvbGxhcHNlV2hpdGVTcGFjZSgpKTsKICAgICAg ICAgICAgICAgICBhdXRvIHdpZHRoID0gc2ltcGxlU2luZ2xlV2hpdGVzcGFjZUNvbnRlbnQgPyBt YWtlT3B0aW9uYWwoSW5saW5lTGF5b3V0VW5pdCB7IGZvbnQuc3BhY2VXaWR0aCgpIH0pIDogaW5s aW5lSXRlbVdpZHRoKHN0YXJ0UG9zaXRpb24sIGl0ZW1MZW5ndGgpOwotICAgICAgICAgICAgICAg IGlubGluZUNvbnRlbnQuYXBwZW5kKElubGluZVRleHRJdGVtOjpjcmVhdGVXaGl0ZXNwYWNlSXRl bShpbmxpbmVUZXh0Qm94LCBzdGFydFBvc2l0aW9uLCBpdGVtTGVuZ3RoLCB3aWR0aCkpOworICAg ICAgICAgICAgICAgIGF1dG8gaXNXb3JkU2VwYXJhdG9yID0gdHJ1ZTsKKyAgICAgICAgICAgICAg ICBpZiAoaXRlbUxlbmd0aCA9PSAxKSB7CisgICAgICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBD aGVjayBpZiB0aGUgY29sbGFwc2libGUgY29udGVudCAobXVsdGlwbGUgd2hpdGVzcGFjZSkgaXMg bm90IGFsd2F5cyBhIHdvcmQgc2VwYXJhdG9yLgorICAgICAgICAgICAgICAgICAgICBpc1dvcmRT ZXBhcmF0b3IgPSB0ZXh0W3N0YXJ0UG9zaXRpb25dID09IHNwYWNlCisgICAgICAgICAgICAgICAg ICAgICAgICB8fCB0ZXh0W3N0YXJ0UG9zaXRpb25dID09IG5vQnJlYWtTcGFjZQorICAgICAgICAg ICAgICAgICAgICAgICAgfHwgdGV4dFtzdGFydFBvc2l0aW9uXSA9PSBldGhpb3BpY1dvcmRzcGFj ZQorICAgICAgICAgICAgICAgICAgICAgICAgfHwgdGV4dFtzdGFydFBvc2l0aW9uXSA9PSBhZWdl YW5Xb3JkU2VwYXJhdG9yTGluZQorICAgICAgICAgICAgICAgICAgICAgICAgfHwgdGV4dFtzdGFy dFBvc2l0aW9uXSA9PSBhZWdlYW5Xb3JkU2VwYXJhdG9yRG90CisgICAgICAgICAgICAgICAgICAg ICAgICB8fCB0ZXh0W3N0YXJ0UG9zaXRpb25dID09IHVnYXJpdGljV29yZERpdmlkZXI7CisgICAg ICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIGlubGluZUNvbnRlbnQuYXBwZW5kKElubGlu ZVRleHRJdGVtOjpjcmVhdGVXaGl0ZXNwYWNlSXRlbShpbmxpbmVUZXh0Qm94LCBzdGFydFBvc2l0 aW9uLCBpdGVtTGVuZ3RoLCBpc1dvcmRTZXBhcmF0b3IsIHdpZHRoKSk7CiAgICAgICAgICAgICB9 OwogCiAgICAgICAgICAgICBhdXRvIGxlbmd0aCA9IG1vdmVUb05leHROb25XaGl0ZXNwYWNlUG9z aXRpb24odGV4dCwgY3VycmVudFBvc2l0aW9uLCBzdHlsZS5wcmVzZXJ2ZU5ld2xpbmUoKSk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVU ZXh0SXRlbS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l VGV4dEl0ZW0uaAppbmRleCBjNTY0ZjNjM2ZjYzgxYjhiZTc5NDA0M2ZiYzI4NDBkMGY4MTc5ZTg2 Li4wNjhmZTBiOTMxM2JkZDYxYmY4N2Y3YmNiOWM0NjZiYzRjNmI4N2Q5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVUZXh0SXRlbS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZVRleHRJdGVt LmgKQEAgLTQ1LDYgKzQ1LDcgQEAgcHVibGljOgogCiAgICAgYm9vbCBpc1doaXRlc3BhY2UoKSBj b25zdCB7IHJldHVybiBtX3RleHRJdGVtVHlwZSA9PSBUZXh0SXRlbVR5cGU6OldoaXRlc3BhY2U7 IH0KICAgICBib29sIGlzQ29sbGFwc2libGUoKSBjb25zdCB7IHJldHVybiBtX2lzQ29sbGFwc2li bGU7IH0KKyAgICBib29sIGlzV29yZFNlcGFyYXRvcigpIGNvbnN0IHsgcmV0dXJuIG1faXNXb3Jk U2VwYXJhdG9yOyB9CiAgICAgYm9vbCBoYXNUcmFpbGluZ1NvZnRIeXBoZW4oKSBjb25zdCB7IHJl dHVybiBtX2hhc1RyYWlsaW5nU29mdEh5cGhlbjsgfQogICAgIE9wdGlvbmFsPElubGluZUxheW91 dFVuaXQ+IHdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV9oYXNXaWR0aCA/IG1ha2VPcHRpb25hbCht X3dpZHRoKSA6IE9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IHsgfTsgfQogICAgIGJvb2wgaXNF bXB0eUNvbnRlbnQoKSBjb25zdDsKQEAgLTU3LDIyICs1OCwyMiBAQCBwdWJsaWM6CiBwcml2YXRl OgogICAgIHVzaW5nIElubGluZUl0ZW06OlRleHRJdGVtVHlwZTsKIAotICAgIElubGluZVRleHRJ dGVtKGNvbnN0IElubGluZVRleHRCb3gmLCB1bnNpZ25lZCBzdGFydCwgdW5zaWduZWQgbGVuZ3Ro LCBib29sIGhhc1RyYWlsaW5nU29mdEh5cGhlbiwgT3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4g d2lkdGgsIFRleHRJdGVtVHlwZSk7CisgICAgSW5saW5lVGV4dEl0ZW0oY29uc3QgSW5saW5lVGV4 dEJveCYsIHVuc2lnbmVkIHN0YXJ0LCB1bnNpZ25lZCBsZW5ndGgsIGJvb2wgaGFzVHJhaWxpbmdT b2Z0SHlwaGVuLCBib29sIGlzV29yZFNlcGFyYXRvciwgT3B0aW9uYWw8SW5saW5lTGF5b3V0VW5p dD4gd2lkdGgsIFRleHRJdGVtVHlwZSk7CiAgICAgSW5saW5lVGV4dEl0ZW0oY29uc3QgSW5saW5l VGV4dEJveCYpOwogCi0gICAgc3RhdGljIElubGluZVRleHRJdGVtIGNyZWF0ZVdoaXRlc3BhY2VJ dGVtKGNvbnN0IElubGluZVRleHRCb3gmLCB1bnNpZ25lZCBzdGFydCwgdW5zaWduZWQgbGVuZ3Ro LCBPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiB3aWR0aCk7CisgICAgc3RhdGljIElubGluZVRl eHRJdGVtIGNyZWF0ZVdoaXRlc3BhY2VJdGVtKGNvbnN0IElubGluZVRleHRCb3gmLCB1bnNpZ25l ZCBzdGFydCwgdW5zaWduZWQgbGVuZ3RoLCBib29sIGlzV29yZFNlcGFyYXRvciwgT3B0aW9uYWw8 SW5saW5lTGF5b3V0VW5pdD4gd2lkdGgpOwogICAgIHN0YXRpYyBJbmxpbmVUZXh0SXRlbSBjcmVh dGVOb25XaGl0ZXNwYWNlSXRlbShjb25zdCBJbmxpbmVUZXh0Qm94JiwgdW5zaWduZWQgc3RhcnQs IHVuc2lnbmVkIGxlbmd0aCwgYm9vbCBoYXNUcmFpbGluZ1NvZnRIeXBoZW4sIE9wdGlvbmFsPElu bGluZUxheW91dFVuaXQ+IHdpZHRoKTsKICAgICBzdGF0aWMgSW5saW5lVGV4dEl0ZW0gY3JlYXRl RW1wdHlJdGVtKGNvbnN0IElubGluZVRleHRCb3gmKTsKIH07CiAKLWlubGluZSBJbmxpbmVUZXh0 SXRlbSBJbmxpbmVUZXh0SXRlbTo6Y3JlYXRlV2hpdGVzcGFjZUl0ZW0oY29uc3QgSW5saW5lVGV4 dEJveCYgaW5saW5lVGV4dEJveCwgdW5zaWduZWQgc3RhcnQsIHVuc2lnbmVkIGxlbmd0aCwgT3B0 aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gd2lkdGgpCitpbmxpbmUgSW5saW5lVGV4dEl0ZW0gSW5s aW5lVGV4dEl0ZW06OmNyZWF0ZVdoaXRlc3BhY2VJdGVtKGNvbnN0IElubGluZVRleHRCb3gmIGlu bGluZVRleHRCb3gsIHVuc2lnbmVkIHN0YXJ0LCB1bnNpZ25lZCBsZW5ndGgsIGJvb2wgaXNXb3Jk U2VwYXJhdG9yLCBPcHRpb25hbDxJbmxpbmVMYXlvdXRVbml0PiB3aWR0aCkKIHsKLSAgICByZXR1 cm4geyBpbmxpbmVUZXh0Qm94LCBzdGFydCwgbGVuZ3RoLCBmYWxzZSwgd2lkdGgsIFRleHRJdGVt VHlwZTo6V2hpdGVzcGFjZSB9OworICAgIHJldHVybiB7IGlubGluZVRleHRCb3gsIHN0YXJ0LCBs ZW5ndGgsIGZhbHNlLCBpc1dvcmRTZXBhcmF0b3IsIHdpZHRoLCBUZXh0SXRlbVR5cGU6OldoaXRl c3BhY2UgfTsKIH0KIAogaW5saW5lIElubGluZVRleHRJdGVtIElubGluZVRleHRJdGVtOjpjcmVh dGVOb25XaGl0ZXNwYWNlSXRlbShjb25zdCBJbmxpbmVUZXh0Qm94JiBpbmxpbmVUZXh0Qm94LCB1 bnNpZ25lZCBzdGFydCwgdW5zaWduZWQgbGVuZ3RoLCBib29sIGhhc1RyYWlsaW5nU29mdEh5cGhl biwgT3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gd2lkdGgpCiB7Ci0gICAgcmV0dXJuIHsgaW5s aW5lVGV4dEJveCwgc3RhcnQsIGxlbmd0aCwgaGFzVHJhaWxpbmdTb2Z0SHlwaGVuLCB3aWR0aCwg VGV4dEl0ZW1UeXBlOjpOb25XaGl0ZXNwYWNlIH07CisgICAgcmV0dXJuIHsgaW5saW5lVGV4dEJv eCwgc3RhcnQsIGxlbmd0aCwgaGFzVHJhaWxpbmdTb2Z0SHlwaGVuLCBmYWxzZSwgd2lkdGgsIFRl eHRJdGVtVHlwZTo6Tm9uV2hpdGVzcGFjZSB9OwogfQogCiBpbmxpbmUgSW5saW5lVGV4dEl0ZW0g SW5saW5lVGV4dEl0ZW06OmNyZWF0ZUVtcHR5SXRlbShjb25zdCBJbmxpbmVUZXh0Qm94JiBpbmxp bmVUZXh0Qm94KQpAQCAtODAsNyArODEsNyBAQCBpbmxpbmUgSW5saW5lVGV4dEl0ZW0gSW5saW5l VGV4dEl0ZW06OmNyZWF0ZUVtcHR5SXRlbShjb25zdCBJbmxpbmVUZXh0Qm94JiBpbmxpbgogICAg IHJldHVybiB7IGlubGluZVRleHRCb3ggfTsKIH0KIAotaW5saW5lIElubGluZVRleHRJdGVtOjpJ bmxpbmVUZXh0SXRlbShjb25zdCBJbmxpbmVUZXh0Qm94JiBpbmxpbmVUZXh0Qm94LCB1bnNpZ25l ZCBzdGFydCwgdW5zaWduZWQgbGVuZ3RoLCBib29sIGhhc1RyYWlsaW5nU29mdEh5cGhlbiwgT3B0 aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gd2lkdGgsIFRleHRJdGVtVHlwZSB0ZXh0SXRlbVR5cGUp CitpbmxpbmUgSW5saW5lVGV4dEl0ZW06OklubGluZVRleHRJdGVtKGNvbnN0IElubGluZVRleHRC b3gmIGlubGluZVRleHRCb3gsIHVuc2lnbmVkIHN0YXJ0LCB1bnNpZ25lZCBsZW5ndGgsIGJvb2wg aGFzVHJhaWxpbmdTb2Z0SHlwaGVuLCBib29sIGlzV29yZFNlcGFyYXRvciwgT3B0aW9uYWw8SW5s aW5lTGF5b3V0VW5pdD4gd2lkdGgsIFRleHRJdGVtVHlwZSB0ZXh0SXRlbVR5cGUpCiAgICAgOiBJ bmxpbmVJdGVtKGlubGluZVRleHRCb3gsIFR5cGU6OlRleHQpCiB7CiAgICAgbV9zdGFydE9yUG9z aXRpb24gPSBzdGFydDsKQEAgLTg4LDYgKzg5LDcgQEAgaW5saW5lIElubGluZVRleHRJdGVtOjpJ bmxpbmVUZXh0SXRlbShjb25zdCBJbmxpbmVUZXh0Qm94JiBpbmxpbmVUZXh0Qm94LCB1bnNpZ24K ICAgICBtX2hhc1dpZHRoID0gISF3aWR0aDsKICAgICBtX2hhc1RyYWlsaW5nU29mdEh5cGhlbiA9 IGhhc1RyYWlsaW5nU29mdEh5cGhlbjsKICAgICBtX2lzQ29sbGFwc2libGUgPSB0ZXh0SXRlbVR5 cGUgPT0gVGV4dEl0ZW1UeXBlOjpXaGl0ZXNwYWNlICYmIGlubGluZVRleHRCb3guc3R5bGUoKS5j b2xsYXBzZVdoaXRlU3BhY2UoKTsKKyAgICBtX2lzV29yZFNlcGFyYXRvciA9IGlzV29yZFNlcGFy YXRvcjsKICAgICBtX3dpZHRoID0gd2lkdGgudmFsdWVPcigwKTsKICAgICBtX3RleHRJdGVtVHlw ZSA9IHRleHRJdGVtVHlwZTsKIH0KQEAgLTEwMiw3ICsxMDQsNyBAQCBpbmxpbmUgSW5saW5lVGV4 dEl0ZW0gSW5saW5lVGV4dEl0ZW06OmxlZnQodW5zaWduZWQgbGVuZ3RoKSBjb25zdAogICAgIFJF TEVBU0VfQVNTRVJUKGxlbmd0aCA8PSB0aGlzLT5sZW5ndGgoKSk7CiAgICAgQVNTRVJUKG1fdGV4 dEl0ZW1UeXBlICE9IFRleHRJdGVtVHlwZTo6VW5kZWZpbmVkKTsKICAgICBBU1NFUlQobGVuZ3Ro KTsKLSAgICByZXR1cm4geyBpbmxpbmVUZXh0Qm94KCksIHN0YXJ0KCksIGxlbmd0aCwgZmFsc2Us IFdURjo6bnVsbG9wdCwgbV90ZXh0SXRlbVR5cGUgfTsKKyAgICByZXR1cm4geyBpbmxpbmVUZXh0 Qm94KCksIHN0YXJ0KCksIGxlbmd0aCwgZmFsc2UsIGlzV29yZFNlcGFyYXRvcigpLCBXVEY6Om51 bGxvcHQsIG1fdGV4dEl0ZW1UeXBlIH07CiB9CiAKIGlubGluZSBJbmxpbmVUZXh0SXRlbSBJbmxp bmVUZXh0SXRlbTo6cmlnaHQodW5zaWduZWQgbGVuZ3RoKSBjb25zdApAQCAtMTEwLDcgKzExMiw3 IEBAIGlubGluZSBJbmxpbmVUZXh0SXRlbSBJbmxpbmVUZXh0SXRlbTo6cmlnaHQodW5zaWduZWQg bGVuZ3RoKSBjb25zdAogICAgIFJFTEVBU0VfQVNTRVJUKGxlbmd0aCA8PSB0aGlzLT5sZW5ndGgo KSk7CiAgICAgQVNTRVJUKG1fdGV4dEl0ZW1UeXBlICE9IFRleHRJdGVtVHlwZTo6VW5kZWZpbmVk KTsKICAgICBBU1NFUlQobGVuZ3RoKTsKLSAgICByZXR1cm4geyBpbmxpbmVUZXh0Qm94KCksIGVu ZCgpIC0gbGVuZ3RoLCBsZW5ndGgsIGhhc1RyYWlsaW5nU29mdEh5cGhlbigpLCBXVEY6Om51bGxv cHQsIG1fdGV4dEl0ZW1UeXBlIH07CisgICAgcmV0dXJuIHsgaW5saW5lVGV4dEJveCgpLCBlbmQo KSAtIGxlbmd0aCwgbGVuZ3RoLCBoYXNUcmFpbGluZ1NvZnRIeXBoZW4oKSwgaXNXb3JkU2VwYXJh dG9yKCksIFdURjo6bnVsbG9wdCwgbV90ZXh0SXRlbVR5cGUgfTsKIH0KIAogfQo=