220131 2020-12-23 16:35:37 -0800 [LFC][IFC] Fast vertical alignment should work with line-height 2020-12-25 09:54:22 -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 1716526 0 zalan 2020-12-23 16:35:37 -0800 ssia 1716527 1 webkit-bug-importer 2020-12-23 16:36:08 -0800 <rdar://problem/72638080> 1716530 2 416733 zalan 2020-12-23 16:39:37 -0800 Created attachment 416733 Patch 1716598 3 416755 zalan 2020-12-25 07:38:53 -0800 Created attachment 416755 Patch 1716603 4 ews-feeder 2020-12-25 09:54:21 -0800 Committed r271084: <https://trac.webkit.org/changeset/271084> All reviewed patches have been landed. Closing bug and clearing flags on attachment 416755. 416733 2020-12-23 16:39:37 -0800 2020-12-25 07:38:51 -0800 Patch bug-220131-20201223163937.patch text/plain 4729 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMDUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTAyMGVkNWQ2ZDc3OTdh Zjg0NjE5OWEyNTVkNzMyYzRjZDVlYzY0ZS4uMmIyYTIyMWFhM2JhZTBjOTdlNDBiYjkzYjJmZTBj NjJhMzU1ZjE1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTEyLTIzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBGYXN0IHZl cnRpY2FsIGFsaWdubWVudCBzaG91bGQgd29yayB3aXRoIGxpbmUtaGVpZ2h0CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjAxMzEKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGp1c3QgdGhlIGxpbmUgYm94 IGhlaWdodCBhbmQgdGhlIHJvb3QgaW5saW5lIGJveCdzIGxvZ2ljYWwgdG9wIHBvc2l0aW9uIGFz IHRoZSBsYXlvdXQgYm91bmRzIG9mIHRoZSBpbmxpbmUtYmxvY2sgY29udGVudCBzdHJldGNoZXMg dGhlIGxpbmUuCisKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3Jt YXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGlu ZUJveEJ1aWxkZXI6OkxpbmVCb3hCdWlsZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 TGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGluZUxldmVsQm94ZXMpOgorCiAyMDIwLTEyLTIy ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBB ZGQgZmFzdCBwYXRoIGZvciB0aGUgbW9zdCBjb21tb24gImlubGluZSBsZXZlbCBib3ggaXMgdGhl IGNoaWxkIG9mIHRoZSByb290IGlubGluZSBib3giIGNhc2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2Vv bWV0cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKaW5kZXggYWQ5M2RlZjYxNjBhOTc2ZTkwYWU4 MzE1MzBmMWMzZTJjNmQwZjhmYS4uNmQ0Y2M4YWM0MjI2OTM1MDI0YTBhMTIyYjUwNTZjNjRiZTBi ODMzNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5j cHAKQEAgLTE0OSw4ICsxNDksNyBAQCBzdGF0aWMgT3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4g aG9yaXpvbnRhbEFsaWdubWVudE9mZnNldChjb25zdCBMaW5lOjpSdW5MaXN0JgogCiBMaW5lQm94 QnVpbGRlcjo6TGluZUJveEJ1aWxkZXIoY29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmIGlu bGluZUZvcm1hdHRpbmdDb250ZXh0KQogICAgIDogbV9pbmxpbmVGb3JtYXR0aW5nQ29udGV4dChp bmxpbmVGb3JtYXR0aW5nQ29udGV4dCkKLSAgICAvLyBGSVhNRTogbGluZS1oZWlnaHQgc2hvdWxk IG5vdCByZXF1aXJlIGNvbXBsZXggYWxpZ25tZW50IGluIHNpbXBsZSBjYXNlcy4KLSAgICAsIG1f aW5saW5lTGV2ZWxCb3hlc05lZWRWZXJ0aWNhbEFsaWdubWVudCghcm9vdEJveCgpLnN0eWxlKCku bGluZUhlaWdodCgpLmlzTmVnYXRpdmUoKSB8fCAhaW5saW5lRm9ybWF0dGluZ0NvbnRleHQubGF5 b3V0U3RhdGUoKS5pbk5vUXVpcmtzTW9kZSgpKQorICAgICwgbV9pbmxpbmVMZXZlbEJveGVzTmVl ZFZlcnRpY2FsQWxpZ25tZW50KCFpbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5sYXlvdXRTdGF0ZSgp LmluTm9RdWlya3NNb2RlKCkpCiB7CiB9CiAKQEAgLTIwNyw2ICsyMDYsMTEgQEAgdm9pZCBMaW5l Qm94QnVpbGRlcjo6c2V0VmVydGljYWxHZW9tZXRyeUZvcklubGluZUJveChMaW5lQm94OjpJbmxp bmVMZXZlbEJveCYgaW4KIHZvaWQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGluZUxldmVs Qm94ZXMoTGluZUJveCYgbGluZUJveCwgY29uc3QgTGluZTo6UnVuTGlzdCYgcnVucykKIHsKICAg ICBhdXRvIGhvcml6b250YWxBbGlnbWVudE9mZnNldCA9IGxpbmVCb3guaG9yaXpvbnRhbEFsaWdu bWVudE9mZnNldCgpLnZhbHVlT3IoSW5saW5lTGF5b3V0VW5pdCB7IH0pOworICAgIHN0cnVjdCBT aW1wbGlmaWVkVmVydGljYWxBbGlnbm1lbnQgeworICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGlu bGluZUxldmVsQm94TGF5b3V0Qm91bmRzT3ZlcmZsb3cgeyAwIH07CisgICAgICAgIElubGluZUxh eW91dFVuaXQgcm9vdElubGluZUJveExvZ2ljYWxUb3AgeyAwIH07CisgICAgfTsKKyAgICBhdXRv IHNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudCA9IFNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVu dCB7IH07CiAgICAgLy8gRW1wdHkgcm9vdCBpbmxpbmUgYm94ZXMgcmVxdWlyZSBzcGVjaWFsIGNv bGxhcHNpbmcuCiAgICAgbV9pbmxpbmVMZXZlbEJveGVzTmVlZFZlcnRpY2FsQWxpZ25tZW50ID0g bV9pbmxpbmVMZXZlbEJveGVzTmVlZFZlcnRpY2FsQWxpZ25tZW50IHx8IHJ1bnMuaXNFbXB0eSgp OwogCkBAIC0yMTgsNyArMjIyLDYgQEAgdm9pZCBMaW5lQm94QnVpbGRlcjo6Y29uc3RydWN0SW5s aW5lTGV2ZWxCb3hlcyhMaW5lQm94JiBsaW5lQm94LCBjb25zdCBMaW5lOjpSdW4KICAgICAgICAg aWYgKGlzSW5pdGlhbGx5Q29uc2lkZXJlZE5vbkVtcHR5KQogICAgICAgICAgICAgcm9vdElubGlu ZUJveC0+c2V0SXNOb25FbXB0eSgpOwogICAgICAgICBzZXRWZXJ0aWNhbEdlb21ldHJ5Rm9ySW5s aW5lQm94KCpyb290SW5saW5lQm94KTsKLSAgICAgICAgbV9pbmxpbmVMZXZlbEJveGVzTmVlZFZl cnRpY2FsQWxpZ25tZW50ID0gbV9pbmxpbmVMZXZlbEJveGVzTmVlZFZlcnRpY2FsQWxpZ25tZW50 IHx8IHJvb3RJbmxpbmVCb3gtPmJhc2VsaW5lKCkgIT0gcm9vdElubGluZUJveC0+bGF5b3V0Qm91 bmRzKCkuYXNjZW50OwogICAgICAgICBsaW5lQm94LmFkZFJvb3RJbmxpbmVCb3goV1RGTW92ZShy b290SW5saW5lQm94KSk7CiAgICAgfTsKICAgICBjcmVhdGVSb290SW5saW5lQm94KCk7CkBAIC0y OTYsNiArMjk5LDExIEBAIHZvaWQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGluZUxldmVs Qm94ZXMoTGluZUJveCYgbGluZUJveCwgY29uc3QgTGluZTo6UnVuCiAgICAgICAgICAgICAgICAg ICAgIG1faW5saW5lTGV2ZWxCb3hlc05lZWRWZXJ0aWNhbEFsaWdubWVudCA9IHRydWU7CiAgICAg ICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAg ICAgaWYgKHJvb3RJbmxpbmVCb3gubGF5b3V0Qm91bmRzKCkuYXNjZW50IDwgYXNjZW50KSB7Cisg ICAgICAgICAgICAgICAgICAgIC8vIFRoZSBpbmxpbmUgbGV2ZWwgYm94IG92ZXJmbG93cyB0aGUg cm9vdCBpbmxpbmUgYm94IGluIHRlcm1zIG9mIGxheW91dCBib3VuZHMuCisgICAgICAgICAgICAg ICAgICAgIHNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudC5pbmxpbmVMZXZlbEJveExheW91dEJv dW5kc092ZXJmbG93ID0gc3RkOjptYXgoc2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50LmlubGlu ZUxldmVsQm94TGF5b3V0Qm91bmRzT3ZlcmZsb3csIGFzY2VudCAtIHJvb3RJbmxpbmVCb3gubGF5 b3V0Qm91bmRzKCkuYXNjZW50KTsKKyAgICAgICAgICAgICAgICAgICAgc2ltcGxpZmllZFZlcnRp Y2FsQWxpZ25tZW50LnJvb3RJbmxpbmVCb3hMb2dpY2FsVG9wID0gc3RkOjptYXgoc2ltcGxpZmll ZFZlcnRpY2FsQWxpZ25tZW50LnJvb3RJbmxpbmVCb3hMb2dpY2FsVG9wLCBhc2NlbnQgLSByb290 SW5saW5lQm94LmJhc2VsaW5lKCkpOworICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAg ICBhdG9taWNJbmxpbmVMZXZlbEJveC0+c2V0TG9naWNhbFRvcChyb290SW5saW5lQm94LmJhc2Vs aW5lKCkgLSBhc2NlbnQpOwogICAgICAgICAgICAgfTsKICAgICAgICAgICAgIGFsaWduSW5saW5l Qm94SWZFbGlnaWJsZSgpOwpAQCAtMzM4LDggKzM0Niw4IEBAIHZvaWQgTGluZUJveEJ1aWxkZXI6 OmNvbnN0cnVjdElubGluZUxldmVsQm94ZXMoTGluZUJveCYgbGluZUJveCwgY29uc3QgTGluZTo6 UnVuCiAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIH0KICAgICBpZiAoIW1faW5s aW5lTGV2ZWxCb3hlc05lZWRWZXJ0aWNhbEFsaWdubWVudCkgewotICAgICAgICByb290SW5saW5l Qm94LnNldExvZ2ljYWxUb3AoeyB9KTsKLSAgICAgICAgbGluZUJveC5zZXRMb2dpY2FsSGVpZ2h0 KHJvb3RJbmxpbmVCb3gubGF5b3V0Qm91bmRzKCkuaGVpZ2h0KCkpOworICAgICAgICByb290SW5s aW5lQm94LnNldExvZ2ljYWxUb3Aoc2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50LnJvb3RJbmxp bmVCb3hMb2dpY2FsVG9wKTsKKyAgICAgICAgbGluZUJveC5zZXRMb2dpY2FsSGVpZ2h0KHJvb3RJ bmxpbmVCb3gubGF5b3V0Qm91bmRzKCkuaGVpZ2h0KCkgKyBzaW1wbGlmaWVkVmVydGljYWxBbGln bm1lbnQuaW5saW5lTGV2ZWxCb3hMYXlvdXRCb3VuZHNPdmVyZmxvdyk7CiAgICAgfQogfQogCg== 416755 2020-12-25 07:38:53 -0800 2020-12-25 09:54:21 -0800 Patch bug-220131-20201225073852.patch text/plain 5110 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxMDgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmY1ZTU2NzljMTQ4MDA0 MmY2ZTJiODhhNWQyMGZjOTNhMmFjMzFhNi4uNzdlMWQ5NzVlYTdkMjliZWUzMWVkN2YwZTZmYzYx YzVjNDlmNWU2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTEyLTIzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBGYXN0IHZl cnRpY2FsIGFsaWdubWVudCBzaG91bGQgd29yayB3aXRoIGxpbmUtaGVpZ2h0CisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjAxMzEKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGp1c3QgdGhlIGxpbmUgYm94 IGhlaWdodCBhbmQgdGhlIHJvb3QgaW5saW5lIGJveCdzIGxvZ2ljYWwgdG9wIHBvc2l0aW9uIGFz IHRoZSBsYXlvdXQgYm91bmRzIG9mIHRoZSBpbmxpbmUtYmxvY2sgY29udGVudCBzdHJldGNoZXMg dGhlIGxpbmUuCisKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3Jt YXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGlu ZUJveEJ1aWxkZXI6OkxpbmVCb3hCdWlsZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 TGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElubGluZUxldmVsQm94ZXMpOgorCiAyMDIwLTEyLTIz ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIENsZWFu IHVwIHNvbWUgY29kZSByZWxhdGVkIHRvIHNjcm9sbCBwaW5uaW5nCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4 dEdlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IGFkOTNkZWY2MTYwYTk3NmU5 MGFlODMxNTMwZjFjM2UyYzZkMGY4ZmEuLjU2NGVlMDM1ODIwZTMwNDFjNzY3YTExOTFkYTJiYzUy MWQ3YjQxZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0 cnkuY3BwCkBAIC0xNDksOCArMTQ5LDcgQEAgc3RhdGljIE9wdGlvbmFsPElubGluZUxheW91dFVu aXQ+IGhvcml6b250YWxBbGlnbm1lbnRPZmZzZXQoY29uc3QgTGluZTo6UnVuTGlzdCYKIAogTGlu ZUJveEJ1aWxkZXI6OkxpbmVCb3hCdWlsZGVyKGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0 JiBpbmxpbmVGb3JtYXR0aW5nQ29udGV4dCkKICAgICA6IG1faW5saW5lRm9ybWF0dGluZ0NvbnRl eHQoaW5saW5lRm9ybWF0dGluZ0NvbnRleHQpCi0gICAgLy8gRklYTUU6IGxpbmUtaGVpZ2h0IHNo b3VsZCBub3QgcmVxdWlyZSBjb21wbGV4IGFsaWdubWVudCBpbiBzaW1wbGUgY2FzZXMuCi0gICAg LCBtX2lubGluZUxldmVsQm94ZXNOZWVkVmVydGljYWxBbGlnbm1lbnQoIXJvb3RCb3goKS5zdHls ZSgpLmxpbmVIZWlnaHQoKS5pc05lZ2F0aXZlKCkgfHwgIWlubGluZUZvcm1hdHRpbmdDb250ZXh0 LmxheW91dFN0YXRlKCkuaW5Ob1F1aXJrc01vZGUoKSkKKyAgICAsIG1faW5saW5lTGV2ZWxCb3hl c05lZWRWZXJ0aWNhbEFsaWdubWVudCghaW5saW5lRm9ybWF0dGluZ0NvbnRleHQubGF5b3V0U3Rh dGUoKS5pbk5vUXVpcmtzTW9kZSgpKQogewogfQogCkBAIC0yMDcsNiArMjA2LDEyIEBAIHZvaWQg TGluZUJveEJ1aWxkZXI6OnNldFZlcnRpY2FsR2VvbWV0cnlGb3JJbmxpbmVCb3goTGluZUJveDo6 SW5saW5lTGV2ZWxCb3gmIGluCiB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVM ZXZlbEJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1bkxpc3QmIHJ1bnMpCiB7 CiAgICAgYXV0byBob3Jpem9udGFsQWxpZ21lbnRPZmZzZXQgPSBsaW5lQm94Lmhvcml6b250YWxB bGlnbm1lbnRPZmZzZXQoKS52YWx1ZU9yKElubGluZUxheW91dFVuaXQgeyB9KTsKKyAgICBzdHJ1 Y3QgU2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50IHsKKyAgICAgICAgSW5saW5lTGF5b3V0VW5p dCBpbmxpbmVMZXZlbEJveFRvcCB7IDAgfTsKKyAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBpbmxp bmVMZXZlbEJveEJvdHRvbSB7IDAgfTsKKyAgICAgICAgSW5saW5lTGF5b3V0VW5pdCByb290SW5s aW5lQm94TG9naWNhbFRvcCB7IDAgfTsKKyAgICB9OworICAgIGF1dG8gc2ltcGxpZmllZFZlcnRp Y2FsQWxpZ25tZW50ID0gU2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50IHsgfTsKICAgICAvLyBF bXB0eSByb290IGlubGluZSBib3hlcyByZXF1aXJlIHNwZWNpYWwgY29sbGFwc2luZy4KICAgICBt X2lubGluZUxldmVsQm94ZXNOZWVkVmVydGljYWxBbGlnbm1lbnQgPSBtX2lubGluZUxldmVsQm94 ZXNOZWVkVmVydGljYWxBbGlnbm1lbnQgfHwgcnVucy5pc0VtcHR5KCk7CiAKQEAgLTIxOCw3ICsy MjMsNyBAQCB2b2lkIExpbmVCb3hCdWlsZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZlbEJveGVzKExp bmVCb3gmIGxpbmVCb3gsIGNvbnN0IExpbmU6OlJ1bgogICAgICAgICBpZiAoaXNJbml0aWFsbHlD b25zaWRlcmVkTm9uRW1wdHkpCiAgICAgICAgICAgICByb290SW5saW5lQm94LT5zZXRJc05vbkVt cHR5KCk7CiAgICAgICAgIHNldFZlcnRpY2FsR2VvbWV0cnlGb3JJbmxpbmVCb3goKnJvb3RJbmxp bmVCb3gpOwotICAgICAgICBtX2lubGluZUxldmVsQm94ZXNOZWVkVmVydGljYWxBbGlnbm1lbnQg PSBtX2lubGluZUxldmVsQm94ZXNOZWVkVmVydGljYWxBbGlnbm1lbnQgfHwgcm9vdElubGluZUJv eC0+YmFzZWxpbmUoKSAhPSByb290SW5saW5lQm94LT5sYXlvdXRCb3VuZHMoKS5hc2NlbnQ7Cisg ICAgICAgIHNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudCA9IHsgeyB9ICwgcm9vdElubGluZUJv eC0+bGF5b3V0Qm91bmRzKCkuaGVpZ2h0KCksIHJvb3RJbmxpbmVCb3gtPmxheW91dEJvdW5kcygp LmFzY2VudCAtIHJvb3RJbmxpbmVCb3gtPmJhc2VsaW5lKCkgfTsKICAgICAgICAgbGluZUJveC5h ZGRSb290SW5saW5lQm94KFdURk1vdmUocm9vdElubGluZUJveCkpOwogICAgIH07CiAgICAgY3Jl YXRlUm9vdElubGluZUJveCgpOwpAQCAtMjk2LDcgKzMwMSwxMyBAQCB2b2lkIExpbmVCb3hCdWls ZGVyOjpjb25zdHJ1Y3RJbmxpbmVMZXZlbEJveGVzKExpbmVCb3gmIGxpbmVCb3gsIGNvbnN0IExp bmU6OlJ1bgogICAgICAgICAgICAgICAgICAgICBtX2lubGluZUxldmVsQm94ZXNOZWVkVmVydGlj YWxBbGlnbm1lbnQgPSB0cnVlOwogICAgICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAg ICAgICAgICAgfQotICAgICAgICAgICAgICAgIGF0b21pY0lubGluZUxldmVsQm94LT5zZXRMb2dp Y2FsVG9wKHJvb3RJbmxpbmVCb3guYmFzZWxpbmUoKSAtIGFzY2VudCk7CisgICAgICAgICAgICAg ICAgLy8gT25seSBiYXNlbGluZSBhbGlnbm1lbnQgZm9yIG5vdy4KKyAgICAgICAgICAgICAgICBh dXRvIGxvZ2ljYWxUb3AgPSByb290SW5saW5lQm94LmJhc2VsaW5lKCkgLSBhc2NlbnQ7CisgICAg ICAgICAgICAgICAgYXV0byBsYXlvdXRCb3VuZHNUb3AgPSByb290SW5saW5lQm94LmxheW91dEJv dW5kcygpLmFzY2VudCAtIGFzY2VudDsKKyAgICAgICAgICAgICAgICBzaW1wbGlmaWVkVmVydGlj YWxBbGlnbm1lbnQuaW5saW5lTGV2ZWxCb3hUb3AgPSBzdGQ6Om1pbihzaW1wbGlmaWVkVmVydGlj YWxBbGlnbm1lbnQuaW5saW5lTGV2ZWxCb3hUb3AsIGxheW91dEJvdW5kc1RvcCk7CisgICAgICAg ICAgICAgICAgc2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50LmlubGluZUxldmVsQm94Qm90dG9t ID0gc3RkOjptYXgoc2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50LmlubGluZUxldmVsQm94Qm90 dG9tLCBsYXlvdXRCb3VuZHNUb3AgKyBtYXJnaW5Cb3hIZWlnaHQpOworICAgICAgICAgICAgICAg IHNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudC5yb290SW5saW5lQm94TG9naWNhbFRvcCA9IHN0 ZDo6bWF4KHNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdubWVudC5yb290SW5saW5lQm94TG9naWNhbFRv cCwgYXNjZW50IC0gcm9vdElubGluZUJveC5iYXNlbGluZSgpKTsKKyAgICAgICAgICAgICAgICBh dG9taWNJbmxpbmVMZXZlbEJveC0+c2V0TG9naWNhbFRvcChsb2dpY2FsVG9wKTsKICAgICAgICAg ICAgIH07CiAgICAgICAgICAgICBhbGlnbklubGluZUJveElmRWxpZ2libGUoKTsKICAgICAgICAg ICAgIGxpbmVCb3guYWRkSW5saW5lTGV2ZWxCb3goV1RGTW92ZShhdG9taWNJbmxpbmVMZXZlbEJv eCkpOwpAQCAtMzM4LDggKzM0OSw4IEBAIHZvaWQgTGluZUJveEJ1aWxkZXI6OmNvbnN0cnVjdElu bGluZUxldmVsQm94ZXMoTGluZUJveCYgbGluZUJveCwgY29uc3QgTGluZTo6UnVuCiAgICAgICAg IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgIH0KICAgICBpZiAoIW1faW5saW5lTGV2ZWxCb3hl c05lZWRWZXJ0aWNhbEFsaWdubWVudCkgewotICAgICAgICByb290SW5saW5lQm94LnNldExvZ2lj YWxUb3AoeyB9KTsKLSAgICAgICAgbGluZUJveC5zZXRMb2dpY2FsSGVpZ2h0KHJvb3RJbmxpbmVC b3gubGF5b3V0Qm91bmRzKCkuaGVpZ2h0KCkpOworICAgICAgICByb290SW5saW5lQm94LnNldExv Z2ljYWxUb3Aoc2ltcGxpZmllZFZlcnRpY2FsQWxpZ25tZW50LnJvb3RJbmxpbmVCb3hMb2dpY2Fs VG9wKTsKKyAgICAgICAgbGluZUJveC5zZXRMb2dpY2FsSGVpZ2h0KHNpbXBsaWZpZWRWZXJ0aWNh bEFsaWdubWVudC5pbmxpbmVMZXZlbEJveEJvdHRvbSAtIHNpbXBsaWZpZWRWZXJ0aWNhbEFsaWdu bWVudC5pbmxpbmVMZXZlbEJveFRvcCk7CiAgICAgfQogfQogCg==