235009 2022-01-08 17:26:56 -0800 [LFC][IFC] Line::Run needs access to FontCascade 2022-01-09 05:52:19 -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 1829265 0 zalan 2022-01-08 17:26:56 -0800 This is in preparation for computing trimmed trailing content width properly. 1829267 1 448688 zalan 2022-01-08 17:37:13 -0800 Created attachment 448688 Patch 1829296 2 ews-feeder 2022-01-09 05:51:36 -0800 Committed r287819 (245871@main): <https://commits.webkit.org/245871@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 448688. 1829297 3 webkit-bug-importer 2022-01-09 05:52:19 -0800 <rdar://problem/87309330> 448688 2022-01-08 17:37:13 -0800 2022-01-09 05:51:39 -0800 Patch bug-235009-20220108173712.patch text/plain 10450 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3ODAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmUxYTU0Yjg3OTEyMzk0 YzgzNjI1MzZkNmFlNjllNjNiNTkxM2VlNy4uNzQyZDFiZDY3YWJmZjUwOGRhOTNlYmFlOGUzNTg4 ZGZkODU2MGQ5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIyLTAxLTA4ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIExpbmU6OlJ1 biBuZWVkcyBhY2Nlc3MgdG8gRm9udENhc2NhZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNTAwOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIGNvbXB1dGlu ZyB0cmltbWVkIHRyYWlsaW5nIGNvbnRlbnQgd2lkdGggcHJvcGVybHkuCisKKyAgICAgICAgKiBs YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6TGluZTo6YXBwZW5kKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6TGluZTo6YXBwZW5kTGluZUJyZWFrKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGlu ZTo6YXBwZW5kV29yZEJyZWFrT3Bwb3J0dW5pdHkpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpMaW5lOjpSdW46OlJ1bik6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Om1fdGV4dENvbnRl bnQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjptX3N0eWxlKTogRGVsZXRlZC4gLSBXZSBs ZWFybnQgaW4gdGhlIHBhc3QgdGhhdCBleHBhbmRpbmcgc3RydWN0dXJlcyBsaWtlIHRoaXMgKHN0 YWNrIGJhY2tlZCwgbGFyZ2UgaW4gbnVtYmVyKSBjb3VsZAorICAgICAgICBsZWFkIHRvIG1lYXN1 cmFibGUgcGVyZiByZWdyZXNzaW9uLgorICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUxpbmUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6 UnVuOjpzaG91bGRUcmFpbGluZ1doaXRlc3BhY2VIYW5nIGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dDo6TGluZTo6UnVuOjppbmxpbmVEaXJlY3Rpb24gY29uc3QpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpSdW46OmxldHRlclNwYWNpbmcgY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpSdW46Omhhc1RleHRDb21iaW5lIGNvbnN0KToKKwog MjAyMi0wMS0wNyAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xG Q10gdHJ5Ym90CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuY3BwCmluZGV4IDU5Zjc2NmExNWJmNDhh MmE2OWUzOGM0NmRlMWU3NjYyYzc3Y2I3MjMuLjhlYTM0MTEzYTk4NDlkODAwOWM1MTI3NjU4NzUz ZmUxYzllODBiYmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuY3BwCkBAIC0yMDUsOSArMjA1 LDkgQEAgdm9pZCBMaW5lOjphcHBlbmQoY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSwgY29u c3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBJbmxpbmUKICAgICBpZiAoaW5saW5lSXRlbS5pc1RleHQo KSkKICAgICAgICAgYXBwZW5kVGV4dENvbnRlbnQoZG93bmNhc3Q8SW5saW5lVGV4dEl0ZW0+KGlu bGluZUl0ZW0pLCBzdHlsZSwgbG9naWNhbFdpZHRoKTsKICAgICBlbHNlIGlmIChpbmxpbmVJdGVt LmlzTGluZUJyZWFrKCkpCi0gICAgICAgIGFwcGVuZExpbmVCcmVhayhpbmxpbmVJdGVtKTsKKyAg ICAgICAgYXBwZW5kTGluZUJyZWFrKGlubGluZUl0ZW0sIHN0eWxlKTsKICAgICBlbHNlIGlmIChp bmxpbmVJdGVtLmlzV29yZEJyZWFrT3Bwb3J0dW5pdHkoKSkKLSAgICAgICAgYXBwZW5kV29yZEJy ZWFrT3Bwb3J0dW5pdHkoaW5saW5lSXRlbSk7CisgICAgICAgIGFwcGVuZFdvcmRCcmVha09wcG9y dHVuaXR5KGlubGluZUl0ZW0sIHN0eWxlKTsKICAgICBlbHNlIGlmIChpbmxpbmVJdGVtLmlzSW5s aW5lQm94U3RhcnQoKSkKICAgICAgICAgYXBwZW5kSW5saW5lQm94U3RhcnQoaW5saW5lSXRlbSwg c3R5bGUsIGxvZ2ljYWxXaWR0aCk7CiAgICAgZWxzZSBpZiAoaW5saW5lSXRlbS5pc0lubGluZUJv eEVuZCgpKQpAQCAtMzcyLDIxICszNzIsMjEgQEAgdm9pZCBMaW5lOjphcHBlbmRSZXBsYWNlZElu bGluZUxldmVsQm94KGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIGNvbnN0IFJlbmQKICAg ICBhcHBlbmROb25SZXBsYWNlZElubGluZUxldmVsQm94KGlubGluZUl0ZW0sIHN0eWxlLCBtYXJn aW5Cb3hMb2dpY2FsV2lkdGgpOwogfQogCi12b2lkIExpbmU6OmFwcGVuZExpbmVCcmVhayhjb25z dCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtKQordm9pZCBMaW5lOjphcHBlbmRMaW5lQnJlYWsoY29u c3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSwgY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlKQogewog ICAgIG1fdHJhaWxpbmdTb2Z0SHlwaGVuV2lkdGggPSB7IH07CiAgICAgaWYgKGlubGluZUl0ZW0u aXNIYXJkTGluZUJyZWFrKCkpIHsKICAgICAgICAgKyttX25vblNwYW5uaW5nSW5saW5lTGV2ZWxC b3hDb3VudDsKLSAgICAgICAgcmV0dXJuIG1fcnVucy5hcHBlbmQoeyBpbmxpbmVJdGVtLCBsYXN0 UnVuTG9naWNhbFJpZ2h0KCkgfSk7CisgICAgICAgIHJldHVybiBtX3J1bnMuYXBwZW5kKHsgaW5s aW5lSXRlbSwgc3R5bGUsIGxhc3RSdW5Mb2dpY2FsUmlnaHQoKSB9KTsKICAgICB9CiAgICAgLy8g U29mdCBsaW5lIGJyZWFrcyAocHJlc2VydmVkIG5ldyBsaW5lIGNoYXJhY3RlcnMpIHJlcXVpcmUg aW5saW5lIHRleHQgYm94ZXMgZm9yIGNvbXBhdGliaWxpdHkgcmVhc29ucy4KICAgICBBU1NFUlQo aW5saW5lSXRlbS5pc1NvZnRMaW5lQnJlYWsoKSk7Ci0gICAgbV9ydW5zLmFwcGVuZCh7IGRvd25j YXN0PElubGluZVNvZnRMaW5lQnJlYWtJdGVtPihpbmxpbmVJdGVtKSwgbGFzdFJ1bkxvZ2ljYWxS aWdodCgpIH0pOworICAgIG1fcnVucy5hcHBlbmQoeyBkb3duY2FzdDxJbmxpbmVTb2Z0TGluZUJy ZWFrSXRlbT4oaW5saW5lSXRlbSksIGlubGluZUl0ZW0uc3R5bGUoKSwgbGFzdFJ1bkxvZ2ljYWxS aWdodCgpIH0pOwogfQogCi12b2lkIExpbmU6OmFwcGVuZFdvcmRCcmVha09wcG9ydHVuaXR5KGNv bnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0pCit2b2lkIExpbmU6OmFwcGVuZFdvcmRCcmVha09w cG9ydHVuaXR5KGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIGNvbnN0IFJlbmRlclN0eWxl JiBzdHlsZSkKIHsKLSAgICBtX3J1bnMuYXBwZW5kKHsgaW5saW5lSXRlbSwgbGFzdFJ1bkxvZ2lj YWxSaWdodCgpIH0pOworICAgIG1fcnVucy5hcHBlbmQoeyBpbmxpbmVJdGVtLCBzdHlsZSwgbGFz dFJ1bkxvZ2ljYWxSaWdodCgpIH0pOwogfQogCiBJbmxpbmVMYXlvdXRVbml0IExpbmU6OmFkZEJv cmRlckFuZFBhZGRpbmdFbmRGb3JJbmxpbmVCb3hEZWNvcmF0aW9uQ2xvbmUoY29uc3QgSW5saW5l SXRlbSYgaW5saW5lQm94U3RhcnRJdGVtKQpAQCAtNTM4LDE2ICs1MzgsMTcgQEAgaW5saW5lIHN0 YXRpYyBMaW5lOjpSdW46OlR5cGUgdG9MaW5lUnVuVHlwZShJbmxpbmVJdGVtOjpUeXBlIGlubGlu ZUl0ZW1UeXBlKQogTGluZTo6UnVuOjpSdW4oY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSwg Y29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0LCBJ bmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCkKICAgICA6IG1fdHlwZSh0b0xpbmVSdW5UeXBl KGlubGluZUl0ZW0udHlwZSgpKSkKICAgICAsIG1fbGF5b3V0Qm94KCZpbmxpbmVJdGVtLmxheW91 dEJveCgpKQorICAgICwgbV9zdHlsZShzdHlsZSkKICAgICAsIG1fbG9naWNhbExlZnQobG9naWNh bExlZnQpCiAgICAgLCBtX2xvZ2ljYWxXaWR0aChsb2dpY2FsV2lkdGgpCi0gICAgLCBtX3N0eWxl KHsgeyB9LCBzdHlsZS5kaXJlY3Rpb24oKSwgeyB9LCB7IH0gfSkKICAgICAsIG1fYmlkaUxldmVs KGlubGluZUl0ZW0uYmlkaUxldmVsKCkpCiB7CiB9CiAKLUxpbmU6OlJ1bjo6UnVuKGNvbnN0IElu bGluZUl0ZW0mIHplcm9XaWRodElubGluZUl0ZW0sIElubGluZUxheW91dFVuaXQgbG9naWNhbExl ZnQpCitMaW5lOjpSdW46OlJ1bihjb25zdCBJbmxpbmVJdGVtJiB6ZXJvV2lkaHRJbmxpbmVJdGVt LCBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQp CiAgICAgOiBtX3R5cGUodG9MaW5lUnVuVHlwZSh6ZXJvV2lkaHRJbmxpbmVJdGVtLnR5cGUoKSkp CiAgICAgLCBtX2xheW91dEJveCgmemVyb1dpZGh0SW5saW5lSXRlbS5sYXlvdXRCb3goKSkKKyAg ICAsIG1fc3R5bGUoc3R5bGUpCiAgICAgLCBtX2xvZ2ljYWxMZWZ0KGxvZ2ljYWxMZWZ0KQogICAg ICwgbV9iaWRpTGV2ZWwoemVyb1dpZGh0SW5saW5lSXRlbS5iaWRpTGV2ZWwoKSkKIHsKQEAgLTU1 Niw2ICs1NTcsNyBAQCBMaW5lOjpSdW46OlJ1bihjb25zdCBJbmxpbmVJdGVtJiB6ZXJvV2lkaHRJ bmxpbmVJdGVtLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZQogTGluZTo6UnVuOjpSdW4oY29u c3QgSW5saW5lSXRlbSYgbGluZVNwYW5uaW5nSW5saW5lQm94SXRlbSwgSW5saW5lTGF5b3V0VW5p dCBsb2dpY2FsTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpCiAgICAgOiBtX3R5 cGUoVHlwZTo6TGluZVNwYW5uaW5nSW5saW5lQm94U3RhcnQpCiAgICAgLCBtX2xheW91dEJveCgm bGluZVNwYW5uaW5nSW5saW5lQm94SXRlbS5sYXlvdXRCb3goKSkKKyAgICAsIG1fc3R5bGUobGlu ZVNwYW5uaW5nSW5saW5lQm94SXRlbS5zdHlsZSgpKQogICAgICwgbV9sb2dpY2FsTGVmdChsb2dp Y2FsTGVmdCkKICAgICAsIG1fbG9naWNhbFdpZHRoKGxvZ2ljYWxXaWR0aCkKICAgICAsIG1fYmlk aUxldmVsKGxpbmVTcGFubmluZ0lubGluZUJveEl0ZW0uYmlkaUxldmVsKCkpCkBAIC01NjMsOSAr NTY1LDEwIEBAIExpbmU6OlJ1bjo6UnVuKGNvbnN0IElubGluZUl0ZW0mIGxpbmVTcGFubmluZ0lu bGluZUJveEl0ZW0sIElubGluZUxheW91dFVuaXQgbG9nCiAgICAgQVNTRVJUKGxpbmVTcGFubmlu Z0lubGluZUJveEl0ZW0uaXNJbmxpbmVCb3hTdGFydCgpKTsKIH0KIAotTGluZTo6UnVuOjpSdW4o Y29uc3QgSW5saW5lU29mdExpbmVCcmVha0l0ZW0mIHNvZnRMaW5lQnJlYWtJdGVtLCBJbmxpbmVM YXlvdXRVbml0IGxvZ2ljYWxMZWZ0KQorTGluZTo6UnVuOjpSdW4oY29uc3QgSW5saW5lU29mdExp bmVCcmVha0l0ZW0mIHNvZnRMaW5lQnJlYWtJdGVtLCBjb25zdCBSZW5kZXJTdHlsZSYgc3R5bGUs IElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQpCiAgICAgOiBtX3R5cGUoVHlwZTo6U29mdExp bmVCcmVhaykKICAgICAsIG1fbGF5b3V0Qm94KCZzb2Z0TGluZUJyZWFrSXRlbS5sYXlvdXRCb3go KSkKKyAgICAsIG1fc3R5bGUoc3R5bGUpCiAgICAgLCBtX2xvZ2ljYWxMZWZ0KGxvZ2ljYWxMZWZ0 KQogICAgICwgbV90ZXh0Q29udGVudCh7IHNvZnRMaW5lQnJlYWtJdGVtLnBvc2l0aW9uKCksIDEg fSkKICAgICAsIG1fYmlkaUxldmVsKHNvZnRMaW5lQnJlYWtJdGVtLmJpZGlMZXZlbCgpKQpAQCAt NTc1LDEyICs1NzgsMTIgQEAgTGluZTo6UnVuOjpSdW4oY29uc3QgSW5saW5lU29mdExpbmVCcmVh a0l0ZW0mIHNvZnRMaW5lQnJlYWtJdGVtLCBJbmxpbmVMYXlvdXRVbmkKIExpbmU6OlJ1bjo6UnVu KGNvbnN0IElubGluZVRleHRJdGVtJiBpbmxpbmVUZXh0SXRlbSwgY29uc3QgUmVuZGVyU3R5bGUm IHN0eWxlLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlvdXRVbml0IGxv Z2ljYWxXaWR0aCkKICAgICA6IG1fdHlwZShpbmxpbmVUZXh0SXRlbS5pc1dvcmRTZXBhcmF0b3Io KSA/IFR5cGU6OldvcmRTZXBhcmF0b3IgOiBUeXBlOjpUZXh0KQogICAgICwgbV9sYXlvdXRCb3go JmlubGluZVRleHRJdGVtLmxheW91dEJveCgpKQorICAgICwgbV9zdHlsZShzdHlsZSkKICAgICAs IG1fbG9naWNhbExlZnQobG9naWNhbExlZnQpCiAgICAgLCBtX2xvZ2ljYWxXaWR0aChsb2dpY2Fs V2lkdGgpCiAgICAgLCBtX3RyYWlsaW5nV2hpdGVzcGFjZVR5cGUodHJhaWxpbmdXaGl0ZXNwYWNl VHlwZShpbmxpbmVUZXh0SXRlbSkpCiAgICAgLCBtX3RyYWlsaW5nV2hpdGVzcGFjZVdpZHRoKG1f dHJhaWxpbmdXaGl0ZXNwYWNlVHlwZSAhPSBUcmFpbGluZ1doaXRlc3BhY2U6Ok5vbmUgPyBsb2dp Y2FsV2lkdGggOiBJbmxpbmVMYXlvdXRVbml0IHsgfSkKICAgICAsIG1fdGV4dENvbnRlbnQoeyBp bmxpbmVUZXh0SXRlbS5zdGFydCgpLCBtX3RyYWlsaW5nV2hpdGVzcGFjZVR5cGUgPT0gVHJhaWxp bmdXaGl0ZXNwYWNlOjpDb2xsYXBzZWQgPyAxIDogaW5saW5lVGV4dEl0ZW0ubGVuZ3RoKCkgfSkK LSAgICAsIG1fc3R5bGUoeyBzdHlsZS53aGl0ZVNwYWNlKCkgPT0gV2hpdGVTcGFjZTo6UHJlV3Jh cCwgc3R5bGUuZGlyZWN0aW9uKCksIHN0eWxlLmxldHRlclNwYWNpbmcoKSwgc3R5bGUuaGFzVGV4 dENvbWJpbmUoKSB9KQogICAgICwgbV9iaWRpTGV2ZWwoaW5saW5lVGV4dEl0ZW0uYmlkaUxldmVs KCkpCiB7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmgKaW5kZXggNTgyYTM3ZGI0ODIyNzY4MTFj MWFmOGNlNTZlZDEwZDA0M2Q4NDk0ZC4uY2QwMTFhNTQzMWMxMjA0OTBiMTdjOTYzOTgwZGVlMjRl YmMyYWI0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuaApAQCAtMTIwLDkgKzEyMCw5IEBAIHB1 YmxpYzoKICAgICAgICAgZnJpZW5kIGNsYXNzIExpbmU7CiAKICAgICAgICAgUnVuKGNvbnN0IElu bGluZVRleHRJdGVtJiwgY29uc3QgUmVuZGVyU3R5bGUmLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2lj YWxMZWZ0LCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCk7Ci0gICAgICAgIFJ1bihjb25z dCBJbmxpbmVTb2Z0TGluZUJyZWFrSXRlbSYsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQp OworICAgICAgICBSdW4oY29uc3QgSW5saW5lU29mdExpbmVCcmVha0l0ZW0mLCBjb25zdCBSZW5k ZXJTdHlsZSYsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQpOwogICAgICAgICBSdW4oY29u c3QgSW5saW5lSXRlbSYsIGNvbnN0IFJlbmRlclN0eWxlJiwgSW5saW5lTGF5b3V0VW5pdCBsb2dp Y2FsTGVmdCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpOwotICAgICAgICBSdW4oY29u c3QgSW5saW5lSXRlbSYsIElubGluZUxheW91dFVuaXQgbG9naWNhbExlZnQpOworICAgICAgICBS dW4oY29uc3QgSW5saW5lSXRlbSYsIGNvbnN0IFJlbmRlclN0eWxlJiwgSW5saW5lTGF5b3V0VW5p dCBsb2dpY2FsTGVmdCk7CiAgICAgICAgIFJ1bihjb25zdCBJbmxpbmVJdGVtJiBsaW5lU3Bhbm5p bmdJbmxpbmVCb3hJdGVtLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0LCBJbmxpbmVMYXlv dXRVbml0IGxvZ2ljYWxXaWR0aCk7CiAKICAgICAgICAgdm9pZCBleHBhbmQoY29uc3QgSW5saW5l VGV4dEl0ZW0mLCBJbmxpbmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCk7CkBAIC0xNDgsMTkgKzE0 OCwxMyBAQCBwdWJsaWM6CiAKICAgICAgICAgVHlwZSBtX3R5cGUgeyBUeXBlOjpUZXh0IH07CiAg ICAgICAgIGNvbnN0IEJveCogbV9sYXlvdXRCb3ggeyBudWxscHRyIH07CisgICAgICAgIGNvbnN0 IFJlbmRlclN0eWxlJiBtX3N0eWxlOwogICAgICAgICBJbmxpbmVMYXlvdXRVbml0IG1fbG9naWNh bExlZnQgeyAwIH07CiAgICAgICAgIElubGluZUxheW91dFVuaXQgbV9sb2dpY2FsV2lkdGggeyAw IH07CiAgICAgICAgIFRyYWlsaW5nV2hpdGVzcGFjZSBtX3RyYWlsaW5nV2hpdGVzcGFjZVR5cGUg eyBUcmFpbGluZ1doaXRlc3BhY2U6Ok5vbmUgfTsKICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBt X3RyYWlsaW5nV2hpdGVzcGFjZVdpZHRoIHsgMCB9OwogICAgICAgICBzdGQ6Om9wdGlvbmFsPFRl eHQ+IG1fdGV4dENvbnRlbnQ7CiAgICAgICAgIElubGluZURpc3BsYXk6OkJveDo6RXhwYW5zaW9u IG1fZXhwYW5zaW9uOwotICAgICAgICBzdHJ1Y3QgU3R5bGUgewotICAgICAgICAgICAgYm9vbCBz aG91bGRUcmFpbGluZ1doaXRlc3BhY2VIYW5nIHsgZmFsc2UgfTsKLSAgICAgICAgICAgIFRleHRE aXJlY3Rpb24gaW5saW5lRGlyZWN0aW9uIHsgVGV4dERpcmVjdGlvbjo6UlRMIH07Ci0gICAgICAg ICAgICBJbmxpbmVMYXlvdXRVbml0IGxldHRlclNwYWNpbmcgeyAwIH07Ci0gICAgICAgICAgICBi b29sIGhhc1RleHRDb21iaW5lIHsgZmFsc2UgfTsKLSAgICAgICAgfTsKLSAgICAgICAgU3R5bGUg bV9zdHlsZSB7IH07CiAgICAgICAgIFVCaURpTGV2ZWwgbV9iaWRpTGV2ZWwgeyBVQklESV9ERUZB VUxUX0xUUiB9OwogICAgIH07CiAgICAgdXNpbmcgUnVuTGlzdCA9IFZlY3RvcjxSdW4sIDEwPjsK QEAgLTE3Niw4ICsxNzAsOCBAQCBwcml2YXRlOgogICAgIHZvaWQgYXBwZW5kUmVwbGFjZWRJbmxp bmVMZXZlbEJveChjb25zdCBJbmxpbmVJdGVtJiwgY29uc3QgUmVuZGVyU3R5bGUmLCBJbmxpbmVM YXlvdXRVbml0IG1hcmdpbkJveExvZ2ljYWxXaWR0aCk7CiAgICAgdm9pZCBhcHBlbmRJbmxpbmVC b3hTdGFydChjb25zdCBJbmxpbmVJdGVtJiwgY29uc3QgUmVuZGVyU3R5bGUmLCBJbmxpbmVMYXlv dXRVbml0IGxvZ2ljYWxXaWR0aCk7CiAgICAgdm9pZCBhcHBlbmRJbmxpbmVCb3hFbmQoY29uc3Qg SW5saW5lSXRlbSYsIGNvbnN0IFJlbmRlclN0eWxlJiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2Fs V2lkdGgpOwotICAgIHZvaWQgYXBwZW5kTGluZUJyZWFrKGNvbnN0IElubGluZUl0ZW0mKTsKLSAg ICB2b2lkIGFwcGVuZFdvcmRCcmVha09wcG9ydHVuaXR5KGNvbnN0IElubGluZUl0ZW0mKTsKKyAg ICB2b2lkIGFwcGVuZExpbmVCcmVhayhjb25zdCBJbmxpbmVJdGVtJiwgY29uc3QgUmVuZGVyU3R5 bGUmKTsKKyAgICB2b2lkIGFwcGVuZFdvcmRCcmVha09wcG9ydHVuaXR5KGNvbnN0IElubGluZUl0 ZW0mLCBjb25zdCBSZW5kZXJTdHlsZSYpOwogCiAgICAgSW5saW5lTGF5b3V0VW5pdCBhZGRCb3Jk ZXJBbmRQYWRkaW5nRW5kRm9ySW5saW5lQm94RGVjb3JhdGlvbkNsb25lKGNvbnN0IElubGluZUl0 ZW0mIGlubGluZUJveFN0YXJ0SXRlbSk7CiAgICAgSW5saW5lTGF5b3V0VW5pdCByZW1vdmVCb3Jk ZXJBbmRQYWRkaW5nRW5kRm9ySW5saW5lQm94RGVjb3JhdGlvbkNsb25lKGNvbnN0IElubGluZUl0 ZW0mIGlubGluZUJveEVuZEl0ZW0pOwpAQCAtMjc3LDIyICsyNzEsMjIgQEAgaW5saW5lIHZvaWQg TGluZTo6UnVuOjpzZXROZWVkc0h5cGhlbihJbmxpbmVMYXlvdXRVbml0IGh5cGhlbkxvZ2ljYWxX aWR0aCkKIAogaW5saW5lIGJvb2wgTGluZTo6UnVuOjpzaG91bGRUcmFpbGluZ1doaXRlc3BhY2VI YW5nKCkgY29uc3QKIHsKLSAgICByZXR1cm4gbV9zdHlsZS5zaG91bGRUcmFpbGluZ1doaXRlc3Bh Y2VIYW5nOworICAgIHJldHVybiBtX3N0eWxlLndoaXRlU3BhY2UoKSA9PSBXaGl0ZVNwYWNlOjpQ cmVXcmFwOwogfQogCiBpbmxpbmUgVGV4dERpcmVjdGlvbiBMaW5lOjpSdW46OmlubGluZURpcmVj dGlvbigpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIG1fc3R5bGUuaW5saW5lRGlyZWN0aW9uOworICAg IHJldHVybiBtX3N0eWxlLmRpcmVjdGlvbigpOwogfQogCiBpbmxpbmUgSW5saW5lTGF5b3V0VW5p dCBMaW5lOjpSdW46OmxldHRlclNwYWNpbmcoKSBjb25zdAogewotICAgIHJldHVybiBtX3N0eWxl LmxldHRlclNwYWNpbmc7CisgICAgcmV0dXJuIG1fc3R5bGUubGV0dGVyU3BhY2luZygpOwogfQog CiBpbmxpbmUgYm9vbCBMaW5lOjpSdW46Omhhc1RleHRDb21iaW5lKCkgY29uc3QKIHsKLSAgICBy ZXR1cm4gbV9zdHlsZS5oYXNUZXh0Q29tYmluZTsKKyAgICByZXR1cm4gbV9zdHlsZS5oYXNUZXh0 Q29tYmluZSgpOwogfQogCiB9Cg==