199558 2019-07-06 21:38:15 -0700 [LFC][IFC] Introduce splitPosition to LineLayout 2019-07-07 06:50:05 -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 1550691 0 zalan 2019-07-06 21:38:15 -0700 This is in preparation for splitting runs. 1550692 1 webkit-bug-importer 2019-07-06 21:38:31 -0700 <rdar://problem/52737649> 1550693 2 373592 zalan 2019-07-06 21:40:44 -0700 Created attachment 373592 Patch 1550707 3 373592 commit-queue 2019-07-07 06:50:03 -0700 Comment on attachment 373592 Patch Clearing flags on attachment: 373592 Committed r247199: <https://trac.webkit.org/changeset/247199> 1550708 4 commit-queue 2019-07-07 06:50:05 -0700 All reviewed patches have been landed. Closing bug. 373592 2019-07-06 21:40:44 -0700 2019-07-07 06:50:03 -0700 Patch bug-199558-20190706214037.patch text/plain 9166 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3MTY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDk3ZTE3NDdkZGNlNTk4 ZDI2MzI5MmI0ZTE0MzgyZTNkZGQwZjdiMC4uNDhhMTU4NTI5MzM1MGQ1NGU2YjkyMGY1NDJhNTNl MzFiYmRkNWZlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE5LTA3LTA2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBJbnRyb2R1 Y2Ugc3BsaXRQb3NpdGlvbiB0byBMaW5lTGF5b3V0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTk1NTgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzUy NzM3NjQ5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIGJyZWFraW5nIHJ1bnMgYXQgbGluZSBlbmQuCisK KyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4 dC5oOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdD b250ZXh0TGluZUxheW91dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZv cm1hdHRpbmdDb250ZXh0OjpMaW5lTGF5b3V0OjpMaW5lSW5wdXQ6OkxpbmVJbnB1dCk6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpMaW5lTGF5b3V0 OjpwbGFjZUlubGluZUl0ZW1zIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5s aW5lRm9ybWF0dGluZ0NvbnRleHQ6OkxpbmVMYXlvdXQ6OmxheW91dCBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRpbmdDb250ZXh0OjpMaW5lTGF5b3V0Ojpj b21wdXRlZEludHJpbnNpY1dpZHRoIGNvbnN0KToKKwogMjAxOS0wNy0wNiAgWmFsYW4gQnVqdGFz ICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdIEZpeCBmb3JtYXR0aW5nIGNvbnRl eHQgcm9vdCBmb3IgaW5mbG93IHBvc2l0aW9uZWQgaW5saW5lIGNvbnRhaW5lcnMKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRp bmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVGb3JtYXR0aW5nQ29udGV4dC5oCmluZGV4IDI0MGQxNjI5NTM5MjgyZWJlYmMzMjY2NjRhMDI4 NzEyZGVkMjZjMmIuLjMwYzVhODQ1YWE1YjYxMTg5MzMwNzBkNGM4ZDdlMTMxYTYxZmM2ZTkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZv cm1hdHRpbmdDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaApAQCAtNTksMTQgKzU5LDEzIEBAIHByaXZh dGU6CiAgICAgcHJpdmF0ZToKICAgICAgICAgTGF5b3V0U3RhdGUmIGxheW91dFN0YXRlKCkgY29u c3QgeyByZXR1cm4gbV9mb3JtYXR0aW5nQ29udGV4dC5sYXlvdXRTdGF0ZSgpOyB9CiAKLSAgICAg ICAgc3RydWN0IExpbmVDb250ZW50IHsKLSAgICAgICAgICAgIE9wdGlvbmFsPHVuc2lnbmVkPiBs YXN0SW5saW5lSXRlbUluZGV4OwotICAgICAgICAgICAgVmVjdG9yPFdlYWtQdHI8SW5saW5lSXRl bT4+IGZsb2F0czsKLSAgICAgICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxMaW5lOjpDb250ZW50PiBy dW5zOworICAgICAgICBzdHJ1Y3QgSW5saW5lSW5kZXhBbmRTcGxpdFBvc2l0aW9uIHsKKyAgICAg ICAgICAgIHVuc2lnbmVkIGluZGV4IHsgMCB9OworICAgICAgICAgICAgT3B0aW9uYWw8dW5zaWdu ZWQ+IHNwbGl0UG9zaXRpb247CiAgICAgICAgIH07CiAKICAgICAgICAgc3RydWN0IExpbmVJbnB1 dCB7Ci0gICAgICAgICAgICBMaW5lSW5wdXQoTGF5b3V0UG9pbnQgbG9naWNhbFRvcExlZnQsIExh eW91dFVuaXQgYXZhaWxhYmxlTG9naWNhbFdpZHRoLCBMaW5lOjpTa2lwVmVydGljYWxBbGlnbWVu dCwgdW5zaWduZWQgZmlyc3RJbmxpbmVJdGVtSW5kZXgsIGNvbnN0IElubGluZUl0ZW1zJik7Cisg ICAgICAgICAgICBMaW5lSW5wdXQoTGF5b3V0UG9pbnQgbG9naWNhbFRvcExlZnQsIExheW91dFVu aXQgYXZhaWxhYmxlTG9naWNhbFdpZHRoLCBMaW5lOjpTa2lwVmVydGljYWxBbGlnbWVudCwgSW5s aW5lSW5kZXhBbmRTcGxpdFBvc2l0aW9uIGZpcnN0VG9Qcm9jZXNzLCBjb25zdCBJbmxpbmVJdGVt cyYpOwogICAgICAgICAgICAgc3RydWN0IEhvcml6b250YWxDb25zdHJhaW50IHsKICAgICAgICAg ICAgICAgICBIb3Jpem9udGFsQ29uc3RyYWludChMYXlvdXRQb2ludCBsb2dpY2FsVG9wTGVmdCwg TGF5b3V0VW5pdCBhdmFpbGFibGVMb2dpY2FsV2lkdGgpOwogCkBAIC03NiwxMCArNzUsMTYgQEAg cHJpdmF0ZToKICAgICAgICAgICAgIEhvcml6b250YWxDb25zdHJhaW50IGhvcml6b250YWxDb25z dHJhaW50OwogICAgICAgICAgICAgLy8gRklYTUUgQWx0ZXJuYXRpdmVseSB3ZSBjb3VsZCBqdXN0 IGhhdmUgYSBzZWNvbmQgcGFzcyB3aXRoIHZlcnRpY2FsIHBvc2l0aW9uaW5nIChwcmVmZXJyZWQg d2lkdGggY29tcHV0YXRpb24gb3B0cyBvdXQpIAogICAgICAgICAgICAgTGluZTo6U2tpcFZlcnRp Y2FsQWxpZ21lbnQgc2tpcFZlcnRpY2FsQWxpZ21lbnQ7Ci0gICAgICAgICAgICB1bnNpZ25lZCBm aXJzdElubGluZUl0ZW1JbmRleCB7IDAgfTsKKyAgICAgICAgICAgIElubGluZUluZGV4QW5kU3Bs aXRQb3NpdGlvbiBmaXJzdElubGluZUl0ZW07CiAgICAgICAgICAgICBjb25zdCBJbmxpbmVJdGVt cyYgaW5saW5lSXRlbXM7CiAgICAgICAgICAgICBPcHRpb25hbDxMYXlvdXRVbml0PiBmbG9hdE1p bmltdW1Mb2dpY2FsQm90dG9tOwogICAgICAgICB9OworCisgICAgICAgIHN0cnVjdCBMaW5lQ29u dGVudCB7CisgICAgICAgICAgICBPcHRpb25hbDxJbmxpbmVJbmRleEFuZFNwbGl0UG9zaXRpb24+ IGxhc3RDb21taXR0ZWQ7CisgICAgICAgICAgICBWZWN0b3I8V2Vha1B0cjxJbmxpbmVJdGVtPj4g ZmxvYXRzOworICAgICAgICAgICAgc3RkOjp1bmlxdWVfcHRyPExpbmU6OkNvbnRlbnQ+IHJ1bnM7 CisgICAgICAgIH07CiAgICAgICAgIExpbmVDb250ZW50IHBsYWNlSW5saW5lSXRlbXMoY29uc3Qg TGluZUlucHV0JikgY29uc3Q7CiAgICAgICAgIHZvaWQgY3JlYXRlRGlzcGxheVJ1bnMoY29uc3Qg TGluZTo6Q29udGVudCYsIGNvbnN0IFZlY3RvcjxXZWFrUHRyPElubGluZUl0ZW0+PiYgZmxvYXRz LCBMYXlvdXRVbml0IHdpZHRoQ29uc3RyYWludCkgY29uc3Q7CiAgICAgICAgIHZvaWQgYWxpZ25S dW5zKFRleHRBbGlnbk1vZGUsIHVuc2lnbmVkIGZpcnN0UnVuSW5kZXgsIExheW91dFVuaXQgYXZh aWxhYmxlV2lkdGgpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRMaW5lTGF5b3V0LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250 ZXh0TGluZUxheW91dC5jcHAKaW5kZXggMWRjM2MwNjdhZGY0Mzc2MDlhM2NiNzRlMjZjNjViOTY4 MGJlZGQ1Yy4uYzBmZmExNmE1MTBmOThhOTU5YjRhYWI3ZmZmMzI1MDZmN2IyZGM5NCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0 dGluZ0NvbnRleHRMaW5lTGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQuY3BwCkBAIC03 OCwxMCArNzgsMTAgQEAgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OkxpbmVMYXlvdXQ6OkxpbmVJ bnB1dDo6SG9yaXpvbnRhbENvbnN0cmFpbnQ6Okhvcml6b250YWwKIHsKIH0KIAotSW5saW5lRm9y bWF0dGluZ0NvbnRleHQ6OkxpbmVMYXlvdXQ6OkxpbmVJbnB1dDo6TGluZUlucHV0KExheW91dFBv aW50IGxvZ2ljYWxUb3BMZWZ0LCBMYXlvdXRVbml0IGF2YWlsYWJsZUxvZ2ljYWxXaWR0aCwgTGlu ZTo6U2tpcFZlcnRpY2FsQWxpZ21lbnQgc2tpcFZlcnRpY2FsQWxpZ21lbnQsIHVuc2lnbmVkIGZp cnN0SW5saW5lSXRlbUluZGV4LCBjb25zdCBJbmxpbmVJdGVtcyYgaW5saW5lSXRlbXMpCitJbmxp bmVGb3JtYXR0aW5nQ29udGV4dDo6TGluZUxheW91dDo6TGluZUlucHV0OjpMaW5lSW5wdXQoTGF5 b3V0UG9pbnQgbG9naWNhbFRvcExlZnQsIExheW91dFVuaXQgYXZhaWxhYmxlTG9naWNhbFdpZHRo LCBMaW5lOjpTa2lwVmVydGljYWxBbGlnbWVudCBza2lwVmVydGljYWxBbGlnbWVudCwgSW5saW5l SW5kZXhBbmRTcGxpdFBvc2l0aW9uIGZpcnN0VG9Qcm9jZXNzLCBjb25zdCBJbmxpbmVJdGVtcyYg aW5saW5lSXRlbXMpCiAgICAgOiBob3Jpem9udGFsQ29uc3RyYWludChsb2dpY2FsVG9wTGVmdCwg YXZhaWxhYmxlTG9naWNhbFdpZHRoKQogICAgICwgc2tpcFZlcnRpY2FsQWxpZ21lbnQoc2tpcFZl cnRpY2FsQWxpZ21lbnQpCi0gICAgLCBmaXJzdElubGluZUl0ZW1JbmRleChmaXJzdElubGluZUl0 ZW1JbmRleCkKKyAgICAsIGZpcnN0SW5saW5lSXRlbShmaXJzdFRvUHJvY2VzcykKICAgICAsIGlu bGluZUl0ZW1zKGlubGluZUl0ZW1zKQogewogfQpAQCAtMTM2LDYgKzEzNiw3IEBAIElubGluZUZv cm1hdHRpbmdDb250ZXh0OjpMaW5lTGF5b3V0OjpMaW5lQ29udGVudCBJbmxpbmVGb3JtYXR0aW5n Q29udGV4dDo6TGluZUxhCiAKICAgICBWZWN0b3I8V2Vha1B0cjxJbmxpbmVJdGVtPj4gZmxvYXRz OwogICAgIHVuc2lnbmVkIGNvbW1pdHRlZElubGluZUl0ZW1Db3VudCA9IDA7CisgICAgT3B0aW9u YWw8dW5zaWduZWQ+IHNwbGl0UG9zaXRpb247CiAKICAgICBVbmNvbW1pdHRlZENvbnRlbnQgdW5j b21taXR0ZWRDb250ZW50OwogICAgIGF1dG8gY29tbWl0UGVuZGluZ0NvbnRlbnQgPSBbJl0gewpA QCAtMTUwLDEyICsxNTEsMTQgQEAgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OkxpbmVMYXlvdXQ6 OkxpbmVDb250ZW50IElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpMaW5lTGEKICAgICBhdXRvIGxp bmVIYXNGbG9hdEJveCA9IGxpbmVJbnB1dC5mbG9hdE1pbmltdW1Mb2dpY2FsQm90dG9tLmhhc1Zh bHVlKCk7CiAgICAgYXV0byBjbG9zZUxpbmUgPSBbJl0gewogICAgICAgICBBU1NFUlQoY29tbWl0 dGVkSW5saW5lSXRlbUNvdW50IHx8IGxpbmVIYXNGbG9hdEJveCk7Ci0gICAgICAgIGF1dG8gbGFz dENvbW1pdHRlZEluZGV4ID0gY29tbWl0dGVkSW5saW5lSXRlbUNvdW50ID8gT3B0aW9uYWw8dW5z aWduZWQ+IHsgbGluZUlucHV0LmZpcnN0SW5saW5lSXRlbUluZGV4ICsgKGNvbW1pdHRlZElubGlu ZUl0ZW1Db3VudCAtIDEpIH0gOiBXVEY6Om51bGxvcHQ7Ci0gICAgICAgIHJldHVybiBMaW5lQ29u dGVudCB7IGxhc3RDb21taXR0ZWRJbmRleCwgV1RGTW92ZShmbG9hdHMpLCBsaW5lLmNsb3NlKCkg fTsKKyAgICAgICAgaWYgKCFjb21taXR0ZWRJbmxpbmVJdGVtQ291bnQpCisgICAgICAgICAgICBy ZXR1cm4gTGluZUNvbnRlbnQgeyBXVEY6Om51bGxvcHQsIFdURk1vdmUoZmxvYXRzKSwgbGluZS5j bG9zZSgpIH07CisgICAgICAgIGF1dG8gbGFzdENvbW1pdGVkSXRlbSA9IElubGluZUluZGV4QW5k U3BsaXRQb3NpdGlvbiB7IGxpbmVJbnB1dC5maXJzdElubGluZUl0ZW0uaW5kZXggKyAoY29tbWl0 dGVkSW5saW5lSXRlbUNvdW50IC0gMSksIHNwbGl0UG9zaXRpb24gfTsKKyAgICAgICAgcmV0dXJu IExpbmVDb250ZW50IHsgbGFzdENvbW1pdGVkSXRlbSwgV1RGTW92ZShmbG9hdHMpLCBsaW5lLmNs b3NlKCkgfTsKICAgICB9OwogICAgIExpbmVCcmVha2VyIGxpbmVCcmVha2VyOwogICAgIC8vIEl0 ZXJhdGUgdGhyb3VnaCB0aGUgaW5saW5lIGNvbnRlbnQgYW5kIHBsYWNlIHRoZSBpbmxpbmUgYm94 ZXMgb24gdGhlIGN1cnJlbnQgbGluZS4KLSAgICBmb3IgKGF1dG8gaW5saW5lSXRlbUluZGV4ID0g bGluZUlucHV0LmZpcnN0SW5saW5lSXRlbUluZGV4OyBpbmxpbmVJdGVtSW5kZXggPCBsaW5lSW5w dXQuaW5saW5lSXRlbXMuc2l6ZSgpOyArK2lubGluZUl0ZW1JbmRleCkgeworICAgIGZvciAoYXV0 byBpbmxpbmVJdGVtSW5kZXggPSBsaW5lSW5wdXQuZmlyc3RJbmxpbmVJdGVtLmluZGV4OyBpbmxp bmVJdGVtSW5kZXggPCBsaW5lSW5wdXQuaW5saW5lSXRlbXMuc2l6ZSgpOyArK2lubGluZUl0ZW1J bmRleCkgewogICAgICAgICBhdXRvIGF2YWlsYWJsZVdpZHRoID0gbGluZS5hdmFpbGFibGVXaWR0 aCgpIC0gdW5jb21taXR0ZWRDb250ZW50LndpZHRoKCk7CiAgICAgICAgIGF1dG8gY3VycmVudExv Z2ljYWxSaWdodCA9IGxpbmUuY29udGVudExvZ2ljYWxSaWdodCgpICsgdW5jb21taXR0ZWRDb250 ZW50LndpZHRoKCk7CiAgICAgICAgIGF1dG8mIGlubGluZUl0ZW0gPSBsaW5lSW5wdXQuaW5saW5l SXRlbXNbaW5saW5lSXRlbUluZGV4XTsKQEAgLTI0OCwxOSArMjUxLDE5IEBAIHZvaWQgSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQ6OkxpbmVMYXlvdXQ6OmxheW91dChMYXlvdXRVbml0IHdpZHRoQ29u c3RyYWludCkgY29uCiAgICAgfTsKIAogICAgIGF1dG8mIGlubGluZUl0ZW1zID0gbV9mb3JtYXR0 aW5nU3RhdGUuaW5saW5lSXRlbXMoKTsKLSAgICB1bnNpZ25lZCBjdXJyZW50SW5saW5lSXRlbUlu ZGV4ID0gMDsKLSAgICB3aGlsZSAoY3VycmVudElubGluZUl0ZW1JbmRleCA8IGlubGluZUl0ZW1z LnNpemUoKSkgewotICAgICAgICBhdXRvIGxpbmVJbnB1dCA9IExpbmVJbnB1dCB7IHsgbGluZUxv Z2ljYWxMZWZ0LCBsaW5lTG9naWNhbFRvcCB9LCB3aWR0aENvbnN0cmFpbnQsIExpbmU6OlNraXBW ZXJ0aWNhbEFsaWdtZW50OjpObywgY3VycmVudElubGluZUl0ZW1JbmRleCwgaW5saW5lSXRlbXMg fTsKKyAgICBJbmxpbmVJbmRleEFuZFNwbGl0UG9zaXRpb24gY3VycmVudElubGluZUl0ZW07Cisg ICAgd2hpbGUgKGN1cnJlbnRJbmxpbmVJdGVtLmluZGV4IDwgaW5saW5lSXRlbXMuc2l6ZSgpKSB7 CisgICAgICAgIGF1dG8gbGluZUlucHV0ID0gTGluZUlucHV0IHsgeyBsaW5lTG9naWNhbExlZnQs IGxpbmVMb2dpY2FsVG9wIH0sIHdpZHRoQ29uc3RyYWludCwgTGluZTo6U2tpcFZlcnRpY2FsQWxp Z21lbnQ6Ok5vLCBjdXJyZW50SW5saW5lSXRlbSwgaW5saW5lSXRlbXMgfTsKICAgICAgICAgYXBw bHlGbG9hdENvbnN0cmFpbnQobGluZUlucHV0KTsKICAgICAgICAgYXV0byBsaW5lQ29udGVudCA9 IHBsYWNlSW5saW5lSXRlbXMobGluZUlucHV0KTsKICAgICAgICAgY3JlYXRlRGlzcGxheVJ1bnMo KmxpbmVDb250ZW50LnJ1bnMsIGxpbmVDb250ZW50LmZsb2F0cywgd2lkdGhDb25zdHJhaW50KTsK LSAgICAgICAgaWYgKCFsaW5lQ29udGVudC5sYXN0SW5saW5lSXRlbUluZGV4KSB7CisgICAgICAg IGlmICghbGluZUNvbnRlbnQubGFzdENvbW1pdHRlZCkgewogICAgICAgICAgICAgLy8gRmxvYXRz IHByZXZlbnRlZCB1cyBwdXR0aW5nIGFueSBjb250ZW50IG9uIHRoZSBsaW5lLgogICAgICAgICAg ICAgQVNTRVJUKGxpbmVJbnB1dC5mbG9hdE1pbmltdW1Mb2dpY2FsQm90dG9tKTsKICAgICAgICAg ICAgIEFTU0VSVChsaW5lQ29udGVudC5ydW5zLT5pc0VtcHR5KCkpOwogICAgICAgICAgICAgbGlu ZUxvZ2ljYWxUb3AgPSAqbGluZUlucHV0LmZsb2F0TWluaW11bUxvZ2ljYWxCb3R0b207CiAgICAg ICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBjdXJyZW50SW5saW5lSXRlbUluZGV4ID0gKmxpbmVD b250ZW50Lmxhc3RJbmxpbmVJdGVtSW5kZXggKyAxOworICAgICAgICAgICAgY3VycmVudElubGlu ZUl0ZW0gPSB7IGxpbmVDb250ZW50Lmxhc3RDb21taXR0ZWQtPmluZGV4ICsgMSwgV1RGOjpudWxs b3B0IH07CiAgICAgICAgICAgICBsaW5lTG9naWNhbFRvcCA9IGxpbmVDb250ZW50LnJ1bnMtPmxv Z2ljYWxCb3R0b20oKTsKICAgICAgICAgfQogICAgIH0KQEAgLTI3MCwxMCArMjczLDEwIEBAIExh eW91dFVuaXQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OkxpbmVMYXlvdXQ6OmNvbXB1dGVkSW50 cmluc2ljV2lkdGgoTGF5b3V0VW5pCiB7CiAgICAgTGF5b3V0VW5pdCBtYXhpbXVtTGluZVdpZHRo OwogICAgIGF1dG8mIGlubGluZUl0ZW1zID0gbV9mb3JtYXR0aW5nU3RhdGUuaW5saW5lSXRlbXMo KTsKLSAgICB1bnNpZ25lZCBjdXJyZW50SW5saW5lSXRlbUluZGV4ID0gMDsKLSAgICB3aGlsZSAo Y3VycmVudElubGluZUl0ZW1JbmRleCA8IGlubGluZUl0ZW1zLnNpemUoKSkgewotICAgICAgICBh dXRvIGxpbmVDb250ZW50ID0gcGxhY2VJbmxpbmVJdGVtcyh7IHsgfSwgd2lkdGhDb25zdHJhaW50 LCBMaW5lOjpTa2lwVmVydGljYWxBbGlnbWVudDo6WWVzLCBjdXJyZW50SW5saW5lSXRlbUluZGV4 LCBpbmxpbmVJdGVtcyB9KTsKLSAgICAgICAgY3VycmVudElubGluZUl0ZW1JbmRleCA9ICpsaW5l Q29udGVudC5sYXN0SW5saW5lSXRlbUluZGV4ICsgMTsKKyAgICBJbmxpbmVJbmRleEFuZFNwbGl0 UG9zaXRpb24gY3VycmVudElubGluZUl0ZW07CisgICAgd2hpbGUgKGN1cnJlbnRJbmxpbmVJdGVt LmluZGV4IDwgaW5saW5lSXRlbXMuc2l6ZSgpKSB7CisgICAgICAgIGF1dG8gbGluZUNvbnRlbnQg PSBwbGFjZUlubGluZUl0ZW1zKHsgeyB9LCB3aWR0aENvbnN0cmFpbnQsIExpbmU6OlNraXBWZXJ0 aWNhbEFsaWdtZW50OjpZZXMsIGN1cnJlbnRJbmxpbmVJdGVtLCBpbmxpbmVJdGVtcyB9KTsKKyAg ICAgICAgY3VycmVudElubGluZUl0ZW0gPSB7IGxpbmVDb250ZW50Lmxhc3RDb21taXR0ZWQtPmlu ZGV4ICsgMSwgV1RGOjpudWxsb3B0IH07CiAgICAgICAgIExheW91dFVuaXQgZmxvYXRzV2lkdGg7 CiAgICAgICAgIGZvciAoYXV0byYgZmxvYXRJdGVtIDogbGluZUNvbnRlbnQuZmxvYXRzKQogICAg ICAgICAgICAgZmxvYXRzV2lkdGggKz0gbGF5b3V0U3RhdGUoKS5kaXNwbGF5Qm94Rm9yTGF5b3V0 Qm94KGZsb2F0SXRlbS0+bGF5b3V0Qm94KCkpLm1hcmdpbkJveFdpZHRoKCk7Cg==