214582 2020-07-20 19:50:26 -0700 [LFC][IFC] Merge alignment logic in LineContentAligner::adjustBaselineAndLineHeight 2020-08-22 13:39:22 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED INVALID InRadar P2 Normal --- 215087 215752 1 zalan zalan bfulgham simon.fraser webkit-bug-importer zalan oldest_to_newest 1673355 0 zalan 2020-07-20 19:50:26 -0700 ssia 1673356 1 404786 zalan 2020-07-20 19:52:06 -0700 Created attachment 404786 Patch 1675500 2 webkit-bug-importer 2020-07-27 19:51:14 -0700 <rdar://problem/66195594> 404786 2020-07-20 19:52:06 -0700 2020-08-22 13:39:22 -0700 Patch bug-214582-20200720195206.patch text/plain 15575 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyNDE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTcyOTQyMGUwNTE5M2Yy OTk4NTUwYzczYTlhOWQzOGViMGUyNzAyMy4uMWYwMGQwMmQ3ZTAzNWRhMjAxYWM0M2ExNmI2MmNh MjBiZDMyMDgwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTA3LTIwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBNZXJnZSBh bGlnbm1lbnQgbG9naWMgaW4gTGluZUNvbnRlbnRBbGlnbmVyOjphZGp1c3RCYXNlbGluZUFuZExp bmVIZWlnaHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIxNDU4MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIGFkZGluZyBuZXN0ZWQgdmVydGljYWwtYWxpZ246 IG1pZGRsZS4KKworICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVC dWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUNvbnRlbnRBbGlnbmVy OjphbGlnblJ1bnNWZXJ0aWNhbGx5KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUNv bnRlbnRBbGlnbmVyOjphZGp1c3RCYXNlbGluZUFuZExpbmVIZWlnaHQpOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6Y2xvc2UpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 b3V0OjpMaW5lQ29udGVudEFsaWduZXI6OnJ1bkNvbnRlbnRIZWlnaHQgY29uc3QpOiBEZWxldGVk LgorCiAyMDIwLTA3LTE5ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAg ICAgW0xGQ11bSUZDXSBNb3ZlIGlubGluZSBydW4gYWxpZ25tZW50IGxvZ2ljIHRvIGEgZGVkaWNh dGVkIGNsYXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKaW5kZXggMTNiMjI4Mjk0MGI0Y2M5YmY2 ZDhlOTI5N2JjYmM5OWJkOTc3MmNiZS4uOTIwMDIyZWM5MWZmZjUwMzg5MGMwMjEzMWU4YThmNGZh YTRjZDQzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcApAQCAtMjAzLDcgKzIwMyw3IEBAIHZv aWQgTGluZUNvbnRlbnRBbGlnbmVyOjphbGlnblJ1bnNWZXJ0aWNhbGx5KCkKIHsKICAgICBhdXRv IHNjcm9sbGFibGVPdmVyZmxvd1JlY3QgPSBtX2xpbmVCb3gubG9naWNhbFJlY3QoKTsKICAgICBm b3IgKGF1dG8mIHJ1biA6IG1fcnVucykgewotICAgICAgICBJbmxpbmVMYXlvdXRVbml0IGxvZ2lj YWxUb3AgPSAwOworICAgICAgICBhdXRvIGxvZ2ljYWxUb3AgPSBJbmxpbmVMYXlvdXRVbml0IHsg fTsKICAgICAgICAgYXV0byYgbGF5b3V0Qm94ID0gcnVuLmxheW91dEJveCgpOwogICAgICAgICBh dXRvIHZlcnRpY2FsQWxpZ24gPSBsYXlvdXRCb3guc3R5bGUoKS52ZXJ0aWNhbEFsaWduKCk7CiAg ICAgICAgIGF1dG8gYXNjZW50ID0gbGF5b3V0Qm94LnN0eWxlKCkuZm9udE1ldHJpY3MoKS5hc2Nl bnQoKTsKQEAgLTI2NywxNCArMjY3LDEzIEBAIHZvaWQgTGluZUNvbnRlbnRBbGlnbmVyOjphbGln blJ1bnNWZXJ0aWNhbGx5KCkKIAogdm9pZCBMaW5lQ29udGVudEFsaWduZXI6OmFkanVzdEJhc2Vs aW5lQW5kTGluZUhlaWdodChPcHRpb25hbDxJbmxpbmVCb3g6OkJhc2VsaW5lPiBpbml0aWFsU3Ry dXQpCiB7CisgICAgLy8gVHdvIHBhc3MKICAgICB1bnNpZ25lZCBpbmxpbmVDb250YWluZXJOZXN0 aW5nTGV2ZWwgPSAwOwogICAgIGF1dG8gaGFzU2VlbkRpcmVjdFRleHRPckxpbmVCcmVhayA9IGZh bHNlOwogICAgIGZvciAoYXV0byYgcnVuIDogbV9ydW5zKSB7CiAgICAgICAgIGF1dG8mIGxheW91 dEJveCA9IHJ1bi5sYXlvdXRCb3goKTsKICAgICAgICAgYXV0byYgc3R5bGUgPSBsYXlvdXRCb3gu c3R5bGUoKTsKIAotICAgICAgICBydW4uc2V0TG9naWNhbEhlaWdodChydW5Db250ZW50SGVpZ2h0 KHJ1bikpOwotCiAgICAgICAgIGlmIChydW4uaXNUZXh0KCkgfHwgcnVuLmlzTGluZUJyZWFrKCkp IHsKICAgICAgICAgICAgIC8vIEZvciB0ZXh0IGNvbnRlbnQgd2Ugc2V0IHRoZSBiYXNlbGluZSBl aXRoZXIgdGhyb3VnaCB0aGUgaW5pdGlhbCBzdHJ1dCAoc2V0IGJ5IHRoZSBmb3JtYXR0aW5nIGNv bnRleHQgcm9vdCkgb3IKICAgICAgICAgICAgIC8vIHRocm91Z2ggdGhlIGlubGluZSBjb250YWlu ZXIgKHN0YXJ0KS4gTm9ybWFsbHkgdGhlIHRleHQgY29udGVudCBpdHNlbGYgZG9lcyBub3Qgc3Ry ZXRjaCB0aGUgbGluZS4KQEAgLTI5OSwzNSArMjk4LDM5IEBAIHZvaWQgTGluZUNvbnRlbnRBbGln bmVyOjphZGp1c3RCYXNlbGluZUFuZExpbmVIZWlnaHQoT3B0aW9uYWw8SW5saW5lQm94OjpCYXNl bGluCiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQogCi0gICAgICAgIGF1dG8gbWlk ZGxlVmVydGljYWxBbGlnbiA9IFsmXShhdXRvIHJ1bkxvZ2ljYWxIZWlnaHQpIHsKLSAgICAgICAg ICAgIC8vIENvbXB1dGUgdGhlIHZlcnRpY2FsIG1pZHBvaW50IG9mIHRoZSBib3ggd2l0aCB0aGUg YmFzZWxpbmUgb2YgdGhlIHBhcmVudCBib3ggcGx1cyBoYWxmIHRoZSB4LWhlaWdodCBvZiB0aGUg cGFyZW50Ci0gICAgICAgICAgICAvLyBhbmQgY2hlY2sgb2Ygd2UgbmVlZCB0byBwdXNoIHRoZSBi YXNlbGluZSBvciBzdHJldGNoIHRoZSBsaW5lLgotICAgICAgICAgICAgYXV0byBjdXJyZW50QmFz ZWxpbmVPZmZzZXQgPSBtX2xpbmVCb3guYmFzZWxpbmVPZmZzZXQoKTsKLSAgICAgICAgICAgIGF1 dG8gcGFyZW50WEhlaWdodCA9IHJvb3QoKS5zdHlsZSgpLmZvbnRNZXRyaWNzKCkueEhlaWdodCgp OwotICAgICAgICAgICAgYXV0byBsb2dpY2FsVG9wID0gY3VycmVudEJhc2VsaW5lT2Zmc2V0IC0g cnVuTG9naWNhbEhlaWdodCAvIDIgLSBwYXJlbnRYSGVpZ2h0IC8gMjsKLSAgICAgICAgICAgIGlm IChsb2dpY2FsVG9wIDwgMCkgewotICAgICAgICAgICAgICAgIC8vIFB1c2ggdGhlIGJhc2VsaW5l IGRvd24gb25seSBpZiB0aGUgcnVuIG92ZXJmbG93cyBhdCB0aGUgdG9wLgotICAgICAgICAgICAg ICAgIGF1dG8gb2Zmc2V0ID0gLWxvZ2ljYWxUb3A7Ci0gICAgICAgICAgICAgICAgbV9saW5lQm94 LnNldEJhc2VsaW5lT2Zmc2V0SWZHcmVhdGVyKGN1cnJlbnRCYXNlbGluZU9mZnNldCArIG9mZnNl dCk7Ci0gICAgICAgICAgICAgICAgLy8gRW5vdWdoIHNwYWNlIGZvciB0aGlzIGlubGluZSBjb250 YWluZXI/Ci0gICAgICAgICAgICAgICAgYXV0byBzcGFjZUZvclJ1biA9IG1fbGluZUJveC5sb2dp Y2FsSGVpZ2h0KCkgLSBydW5Mb2dpY2FsSGVpZ2h0OwotICAgICAgICAgICAgICAgIC8vIEVub3Vn aCBzcGFjZSBmb3IgdGhlIGRlc2NlbnQ/Ci0gICAgICAgICAgICAgICAgYXV0byBzcGFjZUZvckRl c2NlbnQgPSBtX2xpbmVCb3gubG9naWNhbEhlaWdodCgpIC0gKG1fbGluZUJveC5iYXNlbGluZU9m ZnNldCgpICsgbV9saW5lQm94LmJhc2VsaW5lKCkuZGVzY2VudCgpKTsKLSAgICAgICAgICAgICAg ICBhdXRvIHNwYWNlRm9yQ29udGVudCA9IHN0ZDo6bWluKHNwYWNlRm9yUnVuLCBzcGFjZUZvckRl c2NlbnQpOwotICAgICAgICAgICAgICAgIGlmIChzcGFjZUZvckNvbnRlbnQgPCAwKQotICAgICAg ICAgICAgICAgICAgICBtX2xpbmVCb3guc2V0TG9naWNhbEhlaWdodElmR3JlYXRlcihtX2xpbmVC b3gubG9naWNhbEhlaWdodCgpIC0gc3BhY2VGb3JDb250ZW50KTsKLSAgICAgICAgICAgICAgICBy ZXR1cm47Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBtX2xpbmVCb3guc2V0TG9naWNhbEhl aWdodElmR3JlYXRlcihsb2dpY2FsVG9wICsgcnVuTG9naWNhbEhlaWdodCk7Ci0gICAgICAgIH07 Ci0gICAgICAgIGF1dG8gdmVydGljYWxBbGlnbiA9IHN0eWxlLnZlcnRpY2FsQWxpZ24oKTsKLSAg ICAgICAgaWYgKHJ1bi5pc0NvbnRhaW5lclN0YXJ0KCkpIHsKLSAgICAgICAgICAgICsraW5saW5l Q29udGFpbmVyTmVzdGluZ0xldmVsOwotICAgICAgICAgICAgLy8gSW5saW5lIGNvbnRhaW5lcnMg c3RyZXRjaCB0aGUgbGluZSBieSB0aGVpciBmb250IHNpemUuCi0gICAgICAgICAgICAvLyBWZXJ0 aWNhbCBtYXJnaW5zLCBwYWRkaW5ncyBhbmQgYm9yZGVycyBkb24ndCBjb250cmlidXRlIHRvIHRo ZSBsaW5lIGhlaWdodC4KLSAgICAgICAgICAgIGF1dG8mIGZvbnRNZXRyaWNzID0gc3R5bGUuZm9u dE1ldHJpY3MoKTsKLSAgICAgICAgICAgIHN3aXRjaCAodmVydGljYWxBbGlnbikgewotICAgICAg ICAgICAgY2FzZSBWZXJ0aWNhbEFsaWduOjpCYXNlbGluZTogeworICAgICAgICAvLyBGSVhNRTog VGhpcyBmYWlscyB3aGVuIHRoZSBpbmxpbmUgY29udGFpbmVyIGlzIHNwbGl0IGFjcm9zcyBsaW5l cy4KKyAgICAgICAgaW5saW5lQ29udGFpbmVyTmVzdGluZ0xldmVsID0gcnVuLmlzQ29udGFpbmVy U3RhcnQoKSA/IGlubGluZUNvbnRhaW5lck5lc3RpbmdMZXZlbCArIDEgOiBydW4uaXNDb250YWlu ZXJFbmQoKSA/IGlubGluZUNvbnRhaW5lck5lc3RpbmdMZXZlbCAtIDEgOiBpbmxpbmVDb250YWlu ZXJOZXN0aW5nTGV2ZWw7CisgICAgICAgIGlmIChydW4uaXNDb250YWluZXJFbmQoKSkgeworICAg ICAgICAgICAgLy8gVGhlIGxpbmUncyBiYXNlbGluZSBhbmQgaGVpZ2h0IGhhdmUgYWxyZWFkeSBi ZWVuIGFkanVzdGVkIGF0IENvbnRhaW5lclN0YXJ0LgorICAgICAgICAgICAgY29udGludWU7Cisg ICAgICAgIH0KKworICAgICAgICBBU1NFUlQocnVuLmlzQ29udGFpbmVyU3RhcnQoKSB8fCBydW4u aXNCb3goKSk7CisgICAgICAgIC8vIElubGluZSBjb250YWluZXJzIHN0cmV0Y2ggdGhlIGxpbmUg YnkgdGhlaXIgZm9udCBzaXplLgorICAgICAgICAvLyBWZXJ0aWNhbCBtYXJnaW5zLCBwYWRkaW5n cyBhbmQgYm9yZGVycyBkb24ndCBjb250cmlidXRlIHRvIHRoZSBsaW5lIGhlaWdodC4KKyAgICAg ICAgYXV0byYgZm9udE1ldHJpY3MgPSBzdHlsZS5mb250TWV0cmljcygpOworICAgICAgICBhdXRv IHJ1bkxvZ2ljYWxIZWlnaHQgPSBydW4uaXNDb250YWluZXJTdGFydCgpID8gTGF5b3V0VW5pdChz dHlsZS5mb250TWV0cmljcygpLmhlaWdodCgpKSA6IGZvcm1hdHRpbmdDb250ZXh0KCkuZ2VvbWV0 cnlGb3JCb3gobGF5b3V0Qm94KS5tYXJnaW5Cb3hIZWlnaHQoKTsKKyAgICAgICAgc3dpdGNoIChz dHlsZS52ZXJ0aWNhbEFsaWduKCkpIHsKKyAgICAgICAgY2FzZSBWZXJ0aWNhbEFsaWduOjpCYXNl bGluZTogeworICAgICAgICAgICAgaWYgKGxheW91dEJveC5pc0lubGluZUJsb2NrQm94KCkgJiYg bGF5b3V0Qm94LmVzdGFibGlzaGVzSW5saW5lRm9ybWF0dGluZ0NvbnRleHQoKSkgeworICAgICAg ICAgICAgICAgIC8vIElubGluZS1ibG9ja3Mgd2l0aCBpbmxpbmUgY29udGVudCBhbHdheXMgaGF2 ZSBiYXNlbGluZXMuCisgICAgICAgICAgICAgICAgYXV0byYgZm9ybWF0dGluZ1N0YXRlID0gbGF5 b3V0U3RhdGUoKS5lc3RhYmxpc2hlZElubGluZUZvcm1hdHRpbmdTdGF0ZShkb3duY2FzdDxDb250 YWluZXJCb3g+KGxheW91dEJveCkpOworICAgICAgICAgICAgICAgIC8vIFNwZWMgbWFrZXMgdXMg Z2VuZXJhdGUgYXQgbGVhc3Qgb25lIGxpbmUgLWV2ZW4gaWYgaXQgaXMgZW1wdHkuCisgICAgICAg ICAgICAgICAgYXV0byYgbGFzdExpbmVCb3ggPSBmb3JtYXR0aW5nU3RhdGUuZGlzcGxheUlubGlu ZUNvbnRlbnQoKS0+bGluZUJveGVzLmxhc3QoKTsKKyAgICAgICAgICAgICAgICBhdXRvIGlubGlu ZUJsb2NrQmFzZWxpbmUgPSBsYXN0TGluZUJveC5iYXNlbGluZSgpOworICAgICAgICAgICAgICAg IGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ0NvbnRleHQoKS5nZW9tZXRyeUZvckJveChs YXlvdXRCb3gpOworICAgICAgICAgICAgICAgIGF1dG8gYmVmb3JlSGVpZ2h0ID0gYm94R2VvbWV0 cnkubWFyZ2luQmVmb3JlKCkgKyBib3hHZW9tZXRyeS5ib3JkZXJUb3AoKSArIGJveEdlb21ldHJ5 LnBhZGRpbmdUb3AoKS52YWx1ZU9yKDApOworCisgICAgICAgICAgICAgICAgbV9saW5lQm94LnNl dEFzY2VudElmR3JlYXRlcihpbmxpbmVCbG9ja0Jhc2VsaW5lLmFzY2VudCgpKTsKKyAgICAgICAg ICAgICAgICBtX2xpbmVCb3guc2V0RGVzY2VudElmR3JlYXRlcihpbmxpbmVCbG9ja0Jhc2VsaW5l LmRlc2NlbnQoKSk7CisgICAgICAgICAgICAgICAgbV9saW5lQm94LnNldEJhc2VsaW5lT2Zmc2V0 SWZHcmVhdGVyKGJlZm9yZUhlaWdodCArIGxhc3RMaW5lQm94LmJhc2VsaW5lT2Zmc2V0KCkpOwor ICAgICAgICAgICAgICAgIG1fbGluZUJveC5zZXRMb2dpY2FsSGVpZ2h0SWZHcmVhdGVyKHJ1bkxv Z2ljYWxIZWlnaHQpOworICAgICAgICAgICAgfSBlbHNlIGlmIChydW4uaXNCb3goKSkgeworICAg ICAgICAgICAgICAgIC8vIE5vbiBpbmxpbmUtYmxvY2sgYm94ZXMgc2l0IG9uIHRoZSBiYXNlbGlu ZSAoaW5jbHVkaW5nIHRoZWlyIGJvdHRvbSBtYXJnaW4pLgorICAgICAgICAgICAgICAgIG1fbGlu ZUJveC5zZXRBc2NlbnRJZkdyZWF0ZXIocnVuTG9naWNhbEhlaWdodCk7CisgICAgICAgICAgICAg ICAgLy8gSWdub3JlIG5lZ2F0aXZlIGRlc2NlbnQgKHllcywgbmVnYXRpdmUgZGVzY2VudCBpcyBh IHRoaW5nKS4KKyAgICAgICAgICAgICAgICBtX2xpbmVCb3guc2V0TG9naWNhbEhlaWdodElmR3Jl YXRlcihydW5Mb2dpY2FsSGVpZ2h0ICsgc3RkOjptYXg8SW5saW5lTGF5b3V0VW5pdD4oMCwgbV9s aW5lQm94LmJhc2VsaW5lKCkuZGVzY2VudCgpKSk7CisgICAgICAgICAgICB9IGVsc2UgewogICAg ICAgICAgICAgICAgIGF1dG8gaGFsZkxlYWRpbmcgPSBMaW5lQnVpbGRlcjo6aGFsZkxlYWRpbmdN ZXRyaWNzKGZvbnRNZXRyaWNzLCBzdHlsZS5jb21wdXRlZExpbmVIZWlnaHQoKSk7CiAgICAgICAg ICAgICAgICAgLy8gQm90aCBoYWxmbGVhZGluZyBhc2NlbnQgYW5kIGRlc2NlbnQgY291bGQgYmUg bmVnYXRpdmUgKHRhbGwgZm9udCB2cy4gc21hbGwgbGluZS1oZWlnaHQgdmFsdWUpCiAgICAgICAg ICAgICAgICAgaWYgKGhhbGZMZWFkaW5nLmRlc2NlbnQoKSA+IDApCkBAIC0zMzUsOTYgKzMzOCw0 NSBAQCB2b2lkIExpbmVDb250ZW50QWxpZ25lcjo6YWRqdXN0QmFzZWxpbmVBbmRMaW5lSGVpZ2h0 KE9wdGlvbmFsPElubGluZUJveDo6QmFzZWxpbgogICAgICAgICAgICAgICAgIGlmIChoYWxmTGVh ZGluZy5hc2NlbnQoKSA+IDApCiAgICAgICAgICAgICAgICAgICAgIG1fbGluZUJveC5zZXRBc2Nl bnRJZkdyZWF0ZXIoaGFsZkxlYWRpbmcuYXNjZW50KCkpOwogICAgICAgICAgICAgICAgIG1fbGlu ZUJveC5zZXRMb2dpY2FsSGVpZ2h0SWZHcmVhdGVyKG1fbGluZUJveC5iYXNlbGluZSgpLmhlaWdo dCgpKTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAg IGNhc2UgVmVydGljYWxBbGlnbjo6TWlkZGxlOiB7Ci0gICAgICAgICAgICAgICAgbWlkZGxlVmVy dGljYWxBbGlnbihmb250TWV0cmljcy5oZWlnaHQoKSk7Ci0gICAgICAgICAgICAgICAgYnJlYWs7 CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBkZWZhdWx0OgotICAgICAgICAgICAgICAgIG1f bGluZUJveC5zZXRMb2dpY2FsSGVpZ2h0SWZHcmVhdGVyKGZvbnRNZXRyaWNzLmhlaWdodCgpKTsK LSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGNvbnRp bnVlOworICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KLQotICAgICAgICBpZiAocnVuLmlz Q29udGFpbmVyRW5kKCkpIHsKLSAgICAgICAgICAgIC8vIFRoZSBsaW5lJ3MgYmFzZWxpbmUgYW5k IGhlaWdodCBoYXZlIGFscmVhZHkgYmVlbiBhZGp1c3RlZCBhdCBDb250YWluZXJTdGFydC4KLSAg ICAgICAgICAgIEFTU0VSVChpbmxpbmVDb250YWluZXJOZXN0aW5nTGV2ZWwpOwotICAgICAgICAg ICAgLS1pbmxpbmVDb250YWluZXJOZXN0aW5nTGV2ZWw7Ci0gICAgICAgICAgICBjb250aW51ZTsK KyAgICAgICAgY2FzZSBWZXJ0aWNhbEFsaWduOjpUb3A6CisgICAgICAgICAgICAvLyBUb3AgYWxp Z24gY29udGVudCBuZXZlciBjaGFuZ2VzIHRoZSBiYXNlbGluZSwgaXQgb25seSBwdXNoZXMgdGhl IGJvdHRvbSBvZiB0aGUgbGluZSBmdXJ0aGVyIGRvd24uCisgICAgICAgICAgICBtX2xpbmVCb3gu c2V0TG9naWNhbEhlaWdodElmR3JlYXRlcihydW5Mb2dpY2FsSGVpZ2h0KTsKKyAgICAgICAgICAg IGJyZWFrOworICAgICAgICBjYXNlIFZlcnRpY2FsQWxpZ246OkJvdHRvbToKKyAgICAgICAgICAg IC8vIEJvdHRvbSBhbGlnbmVkLCB0YWxsIGNvbnRlbnQgcHVzaGVzIHRoZSBiYXNlbGluZSBmdXJ0 aGVyIGRvd24gZnJvbSB0aGUgbGluZSB0b3AuCisgICAgICAgICAgICBtX2xpbmVCb3guc2V0TG9n aWNhbEhlaWdodElmR3JlYXRlcihydW5Mb2dpY2FsSGVpZ2h0KTsKKyAgICAgICAgICAgIG1fbGlu ZUJveC5zZXRCYXNlbGluZU9mZnNldElmR3JlYXRlcihtX2xpbmVCb3guYmFzZWxpbmVPZmZzZXQo KSArIChydW5Mb2dpY2FsSGVpZ2h0IC0gbV9saW5lQm94LmxvZ2ljYWxIZWlnaHQoKSkpOworICAg ICAgICAgICAgYnJlYWs7CisgICAgICAgIGNhc2UgVmVydGljYWxBbGlnbjo6TWlkZGxlOiB7Cisg ICAgICAgICAgICAvLyBDb21wdXRlIHRoZSB2ZXJ0aWNhbCBtaWRwb2ludCBvZiB0aGUgYm94IHdp dGggdGhlIGJhc2VsaW5lIG9mIHRoZSBwYXJlbnQgYm94IHBsdXMgaGFsZiB0aGUgeC1oZWlnaHQg b2YgdGhlIHBhcmVudAorICAgICAgICAgICAgLy8gYW5kIGNoZWNrIG9mIHdlIG5lZWQgdG8gcHVz aCB0aGUgYmFzZWxpbmUgb3Igc3RyZXRjaCB0aGUgbGluZS4KKyAgICAgICAgICAgIGF1dG8gcGFy ZW50WEhlaWdodCA9IHJvb3QoKS5zdHlsZSgpLmZvbnRNZXRyaWNzKCkueEhlaWdodCgpOworICAg ICAgICAgICAgYXV0byBsb2dpY2FsVG9wID0gbV9saW5lQm94LmJhc2VsaW5lT2Zmc2V0KCkgLSBy dW5Mb2dpY2FsSGVpZ2h0IC8gMiAtIHBhcmVudFhIZWlnaHQgLyAyOworICAgICAgICAgICAgbG9n aWNhbFRvcCArPSBtX2xpbmVCb3gubG9naWNhbFRvcCgpOworICAgICAgICAgICAgaWYgKGxvZ2lj YWxUb3AgPCAwKSB7CisgICAgICAgICAgICAgICAgLy8gUHVzaCB0aGUgYmFzZWxpbmUgZG93biBv bmx5IGlmIHRoZSBydW4gb3ZlcmZsb3dzIGF0IHRoZSB0b3AuCisgICAgICAgICAgICAgICAgYXV0 byBvZmZzZXQgPSAtbG9naWNhbFRvcDsKKyAgICAgICAgICAgICAgICBtX2xpbmVCb3guc2V0QmFz ZWxpbmVPZmZzZXRJZkdyZWF0ZXIobV9saW5lQm94LmJhc2VsaW5lT2Zmc2V0KCkgKyBvZmZzZXQp OworICAgICAgICAgICAgICAgIC8vIE5vdyB0aGF0IHRoYXQgYmFzZWxpbmUgaXMgcHVzaGVkIGRv d24sIGRvIHdlIGhhdmUgZW5vdWdoIHNwYWNlIGZvciB0aGUgZGVzY2VudD8KKyAgICAgICAgICAg ICAgICBhdXRvIGV4dHJhU3BhY2VOZWVkZWRGb3JEZXNjZW50ID0gKG1fbGluZUJveC5iYXNlbGlu ZU9mZnNldCgpICsgbV9saW5lQm94LmJhc2VsaW5lKCkuZGVzY2VudCgpKSAtIG1fbGluZUJveC5s b2dpY2FsSGVpZ2h0KCk7CisgICAgICAgICAgICAgICAgLy8gRG9lcyB0aGlzIHJ1biBmaXQgdGhl IGxpbmU/CisgICAgICAgICAgICAgICAgYXV0byBleHRyYVNwYWNlTmVlZGVkRm9yUnVuID0gcnVu TG9naWNhbEhlaWdodCAtIG1fbGluZUJveC5sb2dpY2FsSGVpZ2h0KCk7CisgICAgICAgICAgICAg ICAgYXV0byBleHRyYVNwYWNlTmVlZGVkID0gc3RkOjptYXgoMC5mLCBzdGQ6Om1pbihleHRyYVNw YWNlTmVlZGVkRm9yRGVzY2VudCwgZXh0cmFTcGFjZU5lZWRlZEZvclJ1bikpOworICAgICAgICAg ICAgICAgIG1fbGluZUJveC5zZXRMb2dpY2FsSGVpZ2h0SWZHcmVhdGVyKG1fbGluZUJveC5sb2dp Y2FsSGVpZ2h0KCkgKyBleHRyYVNwYWNlTmVlZGVkKTsKKyAgICAgICAgICAgIH0gZWxzZQorICAg ICAgICAgICAgICAgIG1fbGluZUJveC5zZXRMb2dpY2FsSGVpZ2h0SWZHcmVhdGVyKGxvZ2ljYWxU b3AgKyBydW5Mb2dpY2FsSGVpZ2h0KTsKKyAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9Ci0K LSAgICAgICAgaWYgKHJ1bi5pc0JveCgpKSB7Ci0gICAgICAgICAgICBhdXRvJiBib3hHZW9tZXRy eSA9IGZvcm1hdHRpbmdDb250ZXh0KCkuZ2VvbWV0cnlGb3JCb3gobGF5b3V0Qm94KTsKLSAgICAg ICAgICAgIGF1dG8gbWFyZ2luQm94SGVpZ2h0ID0gYm94R2VvbWV0cnkubWFyZ2luQm94SGVpZ2h0 KCk7Ci0KLSAgICAgICAgICAgIHN3aXRjaCAodmVydGljYWxBbGlnbikgewotICAgICAgICAgICAg Y2FzZSBWZXJ0aWNhbEFsaWduOjpCYXNlbGluZTogewotICAgICAgICAgICAgICAgIGlmIChsYXlv dXRCb3guaXNJbmxpbmVCbG9ja0JveCgpICYmIGxheW91dEJveC5lc3RhYmxpc2hlc0lubGluZUZv cm1hdHRpbmdDb250ZXh0KCkpIHsKLSAgICAgICAgICAgICAgICAgICAgLy8gSW5saW5lLWJsb2Nr cyB3aXRoIGlubGluZSBjb250ZW50IGFsd2F5cyBoYXZlIGJhc2VsaW5lcy4KLSAgICAgICAgICAg ICAgICAgICAgYXV0byYgZm9ybWF0dGluZ1N0YXRlID0gbGF5b3V0U3RhdGUoKS5lc3RhYmxpc2hl ZElubGluZUZvcm1hdHRpbmdTdGF0ZShkb3duY2FzdDxDb250YWluZXJCb3g+KGxheW91dEJveCkp OwotICAgICAgICAgICAgICAgICAgICAvLyBTcGVjIG1ha2VzIHVzIGdlbmVyYXRlIGF0IGxlYXN0 IG9uZSBsaW5lIC1ldmVuIGlmIGl0IGlzIGVtcHR5LgotICAgICAgICAgICAgICAgICAgICBhdXRv JiBsYXN0TGluZUJveCA9IGZvcm1hdHRpbmdTdGF0ZS5kaXNwbGF5SW5saW5lQ29udGVudCgpLT5s aW5lQm94ZXMubGFzdCgpOwotICAgICAgICAgICAgICAgICAgICBhdXRvIGlubGluZUJsb2NrQmFz ZWxpbmUgPSBsYXN0TGluZUJveC5iYXNlbGluZSgpOwotICAgICAgICAgICAgICAgICAgICBhdXRv IGJlZm9yZUhlaWdodCA9IGJveEdlb21ldHJ5Lm1hcmdpbkJlZm9yZSgpICsgYm94R2VvbWV0cnku Ym9yZGVyVG9wKCkgKyBib3hHZW9tZXRyeS5wYWRkaW5nVG9wKCkudmFsdWVPcigwKTsKLQotICAg ICAgICAgICAgICAgICAgICBtX2xpbmVCb3guc2V0QXNjZW50SWZHcmVhdGVyKGlubGluZUJsb2Nr QmFzZWxpbmUuYXNjZW50KCkpOwotICAgICAgICAgICAgICAgICAgICBtX2xpbmVCb3guc2V0RGVz Y2VudElmR3JlYXRlcihpbmxpbmVCbG9ja0Jhc2VsaW5lLmRlc2NlbnQoKSk7Ci0gICAgICAgICAg ICAgICAgICAgIG1fbGluZUJveC5zZXRCYXNlbGluZU9mZnNldElmR3JlYXRlcihiZWZvcmVIZWln aHQgKyBsYXN0TGluZUJveC5iYXNlbGluZU9mZnNldCgpKTsKLSAgICAgICAgICAgICAgICAgICAg bV9saW5lQm94LnNldExvZ2ljYWxIZWlnaHRJZkdyZWF0ZXIobWFyZ2luQm94SGVpZ2h0KTsKLSAg ICAgICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgICAgICAvLyBOb24gaW5saW5l LWJsb2NrIGJveGVzIHNpdCBvbiB0aGUgYmFzZWxpbmUgKGluY2x1ZGluZyB0aGVpciBib3R0b20g bWFyZ2luKS4KLSAgICAgICAgICAgICAgICAgICAgbV9saW5lQm94LnNldEFzY2VudElmR3JlYXRl cihtYXJnaW5Cb3hIZWlnaHQpOwotICAgICAgICAgICAgICAgICAgICAvLyBJZ25vcmUgbmVnYXRp dmUgZGVzY2VudCAoeWVzLCBuZWdhdGl2ZSBkZXNjZW50IGlzIGEgdGhpbmcpLgotICAgICAgICAg ICAgICAgICAgICBtX2xpbmVCb3guc2V0TG9naWNhbEhlaWdodElmR3JlYXRlcihtYXJnaW5Cb3hI ZWlnaHQgKyBzdGQ6Om1heDxJbmxpbmVMYXlvdXRVbml0PigwLCBtX2xpbmVCb3guYmFzZWxpbmUo KS5kZXNjZW50KCkpKTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgYnJlYWs7 Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBjYXNlIFZlcnRpY2FsQWxpZ246OlRvcDoKLSAg ICAgICAgICAgICAgICAvLyBUb3AgYWxpZ24gY29udGVudCBuZXZlciBjaGFuZ2VzIHRoZSBiYXNl bGluZSwgaXQgb25seSBwdXNoZXMgdGhlIGJvdHRvbSBvZiB0aGUgbGluZSBmdXJ0aGVyIGRvd24u Ci0gICAgICAgICAgICAgICAgbV9saW5lQm94LnNldExvZ2ljYWxIZWlnaHRJZkdyZWF0ZXIobWFy Z2luQm94SGVpZ2h0KTsKLSAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgIGNhc2Ug VmVydGljYWxBbGlnbjo6Qm90dG9tOiB7Ci0gICAgICAgICAgICAgICAgLy8gQm90dG9tIGFsaWdu ZWQsIHRhbGwgY29udGVudCBwdXNoZXMgdGhlIGJhc2VsaW5lIGZ1cnRoZXIgZG93biBmcm9tIHRo ZSBsaW5lIHRvcC4KLSAgICAgICAgICAgICAgICBhdXRvIGxpbmVMb2dpY2FsSGVpZ2h0ID0gbV9s aW5lQm94LmxvZ2ljYWxIZWlnaHQoKTsKLSAgICAgICAgICAgICAgICBpZiAobWFyZ2luQm94SGVp Z2h0ID4gbGluZUxvZ2ljYWxIZWlnaHQpIHsKLSAgICAgICAgICAgICAgICAgICAgbV9saW5lQm94 LnNldExvZ2ljYWxIZWlnaHRJZkdyZWF0ZXIobWFyZ2luQm94SGVpZ2h0KTsKLSAgICAgICAgICAg ICAgICAgICAgbV9saW5lQm94LnNldEJhc2VsaW5lT2Zmc2V0SWZHcmVhdGVyKG1fbGluZUJveC5i YXNlbGluZU9mZnNldCgpICsgKG1hcmdpbkJveEhlaWdodCAtIGxpbmVMb2dpY2FsSGVpZ2h0KSk7 Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAg fQotICAgICAgICAgICAgY2FzZSBWZXJ0aWNhbEFsaWduOjpNaWRkbGU6IHsKLSAgICAgICAgICAg ICAgICBtaWRkbGVWZXJ0aWNhbEFsaWduKG1hcmdpbkJveEhlaWdodCk7Ci0gICAgICAgICAgICAg ICAgYnJlYWs7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBkZWZhdWx0OgotICAgICAgICAg ICAgICAgIEFTU0VSVF9OT1RfSU1QTEVNRU5URURfWUVUKCk7Ci0gICAgICAgICAgICAgICAgYnJl YWs7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgZGVmYXVs dDoKKyAgICAgICAgICAgIG1fbGluZUJveC5zZXRMb2dpY2FsSGVpZ2h0SWZHcmVhdGVyKHJ1bkxv Z2ljYWxIZWlnaHQpOworICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIH0KICAgICB9CiB9CiAK LUlubGluZUxheW91dFVuaXQgTGluZUNvbnRlbnRBbGlnbmVyOjpydW5Db250ZW50SGVpZ2h0KGNv bnN0IExpbmVCdWlsZGVyOjpSdW4mIHJ1bikgY29uc3QKLXsKLSAgICBhdXRvJiBmb250TWV0cmlj cyA9IHJ1bi5zdHlsZSgpLmZvbnRNZXRyaWNzKCk7Ci0gICAgaWYgKHJ1bi5pc1RleHQoKSB8fCBy dW4uaXNMaW5lQnJlYWsoKSkKLSAgICAgICAgcmV0dXJuIGZvbnRNZXRyaWNzLmhlaWdodCgpOwot Ci0gICAgaWYgKHJ1bi5pc0NvbnRhaW5lclN0YXJ0KCkgfHwgcnVuLmlzQ29udGFpbmVyRW5kKCkp Ci0gICAgICAgIHJldHVybiBmb250TWV0cmljcy5oZWlnaHQoKTsKLQotICAgIGF1dG8mIGxheW91 dEJveCA9IHJ1bi5sYXlvdXRCb3goKTsKLSAgICBhdXRvJiBib3hHZW9tZXRyeSA9IGZvcm1hdHRp bmdDb250ZXh0KCkuZ2VvbWV0cnlGb3JCb3gobGF5b3V0Qm94KTsKLSAgICBpZiAobGF5b3V0Qm94 LmlzUmVwbGFjZWRCb3goKSB8fCBsYXlvdXRCb3guaXNGbG9hdGluZ1Bvc2l0aW9uZWQoKSkKLSAg ICAgICAgcmV0dXJuIGJveEdlb21ldHJ5LmNvbnRlbnRCb3hIZWlnaHQoKTsKLQotICAgIC8vIE5v bi1yZXBsYWNlZCBpbmxpbmUgYm94IChlLmcuIGlubGluZS1ibG9jaykuIEl0IGxvb2tzIGEgYml0 IG1pc2xlYWRpbmcgYnV0IHRoZWlyIG1hcmdpbiBib3ggaXMgY29uc2lkZXJlZCB0aGUgY29udGVu dCBoZWlnaHQgaGVyZS4KLSAgICByZXR1cm4gYm94R2VvbWV0cnkubWFyZ2luQm94SGVpZ2h0KCk7 Ci19Ci0KIExpbmVCdWlsZGVyOjpMaW5lQnVpbGRlcihjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29u dGV4dCYgaW5saW5lRm9ybWF0dGluZ0NvbnRleHQsIEludHJpbnNpY1NpemluZyBpbnRyaW5zaWNT aXppbmcpCiAgICAgOiBtX2lubGluZUZvcm1hdHRpbmdDb250ZXh0KGlubGluZUZvcm1hdHRpbmdD b250ZXh0KQogICAgICwgbV90cmltbWFibGVUcmFpbGluZ0NvbnRlbnQobV9ydW5zKQpAQCAtNDc3 LDYgKzQyOSwyMyBAQCBMaW5lQnVpbGRlcjo6UnVuTGlzdCBMaW5lQnVpbGRlcjo6Y2xvc2UoSXNM YXN0TGluZVdpdGhJbmxpbmVDb250ZW50IGlzTGFzdExpbmVXaQogICAgIGlmIChtX2lzSW50cmlu c2ljU2l6aW5nKQogICAgICAgICByZXR1cm4gV1RGTW92ZShtX3J1bnMpOwogCisgICAgZm9yIChh dXRvJiBydW4gOiBtX3J1bnMpIHsKKyAgICAgICAgYXV0byBsb2dpY2FsSGVpZ2h0ID0gWyZdICgp IC0+IExheW91dFVuaXQgeworICAgICAgICAgICAgYXV0byYgZm9udE1ldHJpY3MgPSBydW4uc3R5 bGUoKS5mb250TWV0cmljcygpOworICAgICAgICAgICAgaWYgKHJ1bi5pc1RleHQoKSB8fCBydW4u aXNMaW5lQnJlYWsoKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gZm9udE1ldHJpY3MuaGVpZ2h0 KCk7CisgICAgICAgICAgICBpZiAocnVuLmlzQ29udGFpbmVyU3RhcnQoKSB8fCBydW4uaXNDb250 YWluZXJFbmQoKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gZm9udE1ldHJpY3MuaGVpZ2h0KCk7 CisgICAgICAgICAgICBhdXRvJiBsYXlvdXRCb3ggPSBydW4ubGF5b3V0Qm94KCk7CisgICAgICAg ICAgICBhdXRvJiBib3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdDb250ZXh0KCkuZ2VvbWV0cnlGb3JC b3gobGF5b3V0Qm94KTsKKyAgICAgICAgICAgIGlmIChsYXlvdXRCb3guaXNSZXBsYWNlZEJveCgp IHx8IGxheW91dEJveC5pc0Zsb2F0aW5nUG9zaXRpb25lZCgpKQorICAgICAgICAgICAgICAgIHJl dHVybiBib3hHZW9tZXRyeS5jb250ZW50Qm94SGVpZ2h0KCk7CisgICAgICAgICAgICAvLyBOb24t cmVwbGFjZWQgaW5saW5lIGJveCAoZS5nLiBpbmxpbmUtYmxvY2spLiBJdCBsb29rcyBhIGJpdCBt aXNsZWFkaW5nIGJ1dCB0aGVpciBtYXJnaW4gYm94IGlzIGNvbnNpZGVyZWQgdGhlIGNvbnRlbnQg aGVpZ2h0IGhlcmUuCisgICAgICAgICAgICByZXR1cm4gYm94R2VvbWV0cnkubWFyZ2luQm94SGVp Z2h0KCk7CisgICAgICAgIH0oKTsKKyAgICAgICAgcnVuLnNldExvZ2ljYWxIZWlnaHQobG9naWNh bEhlaWdodCk7CisgICAgfQorCiAgICAgYXV0byBoYW5naW5nQ29udGVudCA9IGNvbGxlY3RIYW5n aW5nQ29udGVudChpc0xhc3RMaW5lV2l0aElubGluZUNvbnRlbnQpOwogICAgIGF1dG8gY29udGVu dEFsaWduZXIgPSBMaW5lQ29udGVudEFsaWduZXIgeyBmb3JtYXR0aW5nQ29udGV4dCgpLCBtX2xp bmVCb3gsIG1fcnVucyB9OwogICAgIGNvbnRlbnRBbGlnbmVyLmFsaWduSG9yaXpvbnRhbGx5KGF2 YWlsYWJsZVdpZHRoKCkgKyBoYW5naW5nQ29udGVudC53aWR0aCgpLCBpc0xhc3RMaW5lV2l0aElu bGluZUNvbnRlbnQpOwo=