261746 2023-09-19 09:02:23 -0700 [IFC][Cleanup] Use helper lambdas in LineBoxBuilder::setLayoutBoundsForInlineBox 2023-09-19 12:01:28 -0700 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 1978302 0 zalan 2023-09-19 09:02:23 -0700 ssia 1978304 1 467753 zalan 2023-09-19 09:04:56 -0700 Created attachment 467753 [fast-cq]Patch 1978375 2 ews-feeder 2023-09-19 12:00:16 -0700 Committed 268140@main (a2a838ebc894): <https://commits.webkit.org/268140@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 467753. 1978376 3 webkit-bug-importer 2023-09-19 12:01:28 -0700 <rdar://problem/115739244> 467753 2023-09-19 09:04:56 -0700 2023-09-19 12:00:18 -0700 [fast-cq]Patch bug-261746-20230919090455.patch text/plain 10240 zalan RnJvbSA1YWM2Njk0YTRjYzFmMjcyNjlmODZjZDcxYWZiNmQ4YTUxMzQ5MjY3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFR1ZSwgMTkgU2VwIDIwMjMgMDk6MDA6MDcgLTA3MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXVtD bGVhbnVwXSBVc2UgaGVscGVyIGxhbWJkYXMgaW4KIExpbmVCb3hCdWlsZGVyOjpzZXRMYXlvdXRC b3VuZHNGb3JJbmxpbmVCb3gKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yNjE3NDYKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKVGhpcyBpcyBpbiBwcmVwYXJh dGlvbiBmb3IgaW50cm9kdWNpbmcgcnVieSBsb2dpYyB0byBzZXRMYXlvdXRCb3VuZHNGb3JJbmxp bmVCb3ggdG8gc3RyZXRjaCBsaW5lcyB3aXRoIGFubm90YXRpb24gYm94ZXMuCgoqIFNvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCb3hCdWls ZGVyLmNwcDoKKFdlYkNvcmU6OkxheW91dDo6TGluZUJveEJ1aWxkZXI6OmVuY2xvc2luZ0FzY2Vu dERlc2NlbnRXaXRoRmFsbGJhY2tGb250cyBjb25zdCk6CihXZWJDb3JlOjpMYXlvdXQ6OkxpbmVC b3hCdWlsZGVyOjpzZXRMYXlvdXRCb3VuZHNGb3JJbmxpbmVCb3ggY29uc3QpOgooV2ViQ29yZTo6 TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6c2V0VmVydGljYWxQcm9wZXJ0aWVzRm9ySW5saW5lTGV2 ZWxCb3ggY29uc3QpOgooV2ViQ29yZTo6TGF5b3V0OjpMaW5lQm94QnVpbGRlcjo6YWRqdXN0SW5s aW5lQm94SGVpZ2h0c0ZvckxpbmVCb3hDb250YWluSWZBcHBsaWNhYmxlKToKLS0tCiAuLi4vaW5s aW5lL0lubGluZUxpbmVCb3hCdWlsZGVyLmNwcCAgICAgICAgICAgfCA5NiArKysrKysrKysrLS0t LS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNTMgaW5zZXJ0aW9ucygrKSwgNDMgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJveEJ1aWxkZXIuY3BwCmluZGV4IDNl MjMzZDM3YTRiMi4uNTM3ZGI0NDY5MTk5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQm94QnVpbGRlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l TGluZUJveEJ1aWxkZXIuY3BwCkBAIC0zMiw2ICszMiw3IEBACiAjaW5jbHVkZSAiSW5saW5lTGlu ZUJ1aWxkZXIuaCIKICNpbmNsdWRlICJMYXlvdXRCb3hHZW9tZXRyeS5oIgogI2luY2x1ZGUgIlJl bmRlclN0eWxlSW5saW5lcy5oIgorI2luY2x1ZGUgIlJ1YnlGb3JtYXR0aW5nQ29udGV4dC5oIgog CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiBuYW1lc3BhY2UgTGF5b3V0IHsKQEAgLTE3MCwxNCArMTcx LDE0IEBAIElubGluZUxldmVsQm94OjpBc2NlbnRBbmREZXNjZW50IExpbmVCb3hCdWlsZGVyOjpl bmNsb3NpbmdBc2NlbnREZXNjZW50V2l0aEZhbGxiCiAgICAgYXV0byBzaG91bGRVc2VMaW5lR2Fw VG9BZGp1c3RBc2NlbnREZXNjZW50ID0gaW5saW5lQm94LmlzUm9vdElubGluZUJveCgpIHx8IGlz VGV4dEJveEVkZ2VMZWFkaW5nKGlubGluZUJveCk7CiAgICAgZm9yIChhdXRvJiBmb250IDogZmFs bGJhY2tGb250c0ZvckNvbnRlbnQpIHsKICAgICAgICAgYXV0byYgZm9udE1ldHJpY3MgPSBmb250 LmZvbnRNZXRyaWNzKCk7Ci0gICAgICAgIGF1dG8gYXNjZW50QW5kRGVzY2VudCA9IGFzY2VudEFu ZERlc2NlbnRXaXRoVGV4dEJveEVkZ2VGb3JJbmxpbmVCb3goaW5saW5lQm94LCBmb250TWV0cmlj cywgZm9udEJhc2VsaW5lKTsKKyAgICAgICAgYXV0byBbYXNjZW50LCBkZXNjZW50XSA9IGFzY2Vu dEFuZERlc2NlbnRXaXRoVGV4dEJveEVkZ2VGb3JJbmxpbmVCb3goaW5saW5lQm94LCBmb250TWV0 cmljcywgZm9udEJhc2VsaW5lKTsKICAgICAgICAgaWYgKHNob3VsZFVzZUxpbmVHYXBUb0FkanVz dEFzY2VudERlc2NlbnQpIHsKLSAgICAgICAgICAgIGF1dG8gaGFsZkxlYWRpbmcgPSAoZm9udE1l dHJpY3MubGluZVNwYWNpbmcoKSAtIGFzY2VudEFuZERlc2NlbnQuaGVpZ2h0KCkpIC8gMjsKLSAg ICAgICAgICAgIGFzY2VudEFuZERlc2NlbnQuYXNjZW50ICs9IGhhbGZMZWFkaW5nOwotICAgICAg ICAgICAgYXNjZW50QW5kRGVzY2VudC5kZXNjZW50ICs9IGhhbGZMZWFkaW5nOworICAgICAgICAg ICAgYXV0byBoYWxmTGVhZGluZyA9IChmb250TWV0cmljcy5saW5lU3BhY2luZygpIC0gKGFzY2Vu dCArIGRlc2NlbnQpKSAvIDI7CisgICAgICAgICAgICBhc2NlbnQgKz0gaGFsZkxlYWRpbmc7Cisg ICAgICAgICAgICBkZXNjZW50ICs9IGhhbGZMZWFkaW5nOwogICAgICAgICB9Ci0gICAgICAgIG1h eEFzY2VudCA9IHN0ZDo6bWF4KG1heEFzY2VudCwgYXNjZW50QW5kRGVzY2VudC5hc2NlbnQpOwot ICAgICAgICBtYXhEZXNjZW50ID0gc3RkOjptYXgobWF4RGVzY2VudCwgYXNjZW50QW5kRGVzY2Vu dC5kZXNjZW50KTsKKyAgICAgICAgbWF4QXNjZW50ID0gc3RkOjptYXgobWF4QXNjZW50LCBhc2Nl bnQpOworICAgICAgICBtYXhEZXNjZW50ID0gc3RkOjptYXgobWF4RGVzY2VudCwgZGVzY2VudCk7 CiAgICAgfQogICAgIC8vIFdlIG5lZWQgZmxvb3IvY2VpbCB0byBtYXRjaCBsZWdhY3kgbGF5b3V0 IGludGVncmFsIHBvc2l0aW9uaW5nLgogICAgIHJldHVybiB7IGZsb29yZihtYXhBc2NlbnQpLCBj ZWlsZihtYXhEZXNjZW50KSB9OwpAQCAtMTg3LDQzICsxODgsNTAgQEAgdm9pZCBMaW5lQm94QnVp bGRlcjo6c2V0TGF5b3V0Qm91bmRzRm9ySW5saW5lQm94KElubGluZUxldmVsQm94JiBpbmxpbmVC b3gsIEZvbnQKIHsKICAgICBBU1NFUlQoaW5saW5lQm94LmlzSW5saW5lQm94KCkpOwogCi0gICAg YXV0byBhc2NlbnRBbmREZXNjZW50ID0gYXNjZW50QW5kRGVzY2VudFdpdGhUZXh0Qm94RWRnZUZv cklubGluZUJveChpbmxpbmVCb3gsIGlubGluZUJveC5wcmltYXJ5bWV0cmljc09mUHJpbWFyeUZv bnQoKSwgZm9udEJhc2VsaW5lKTsKLSAgICBhdXRvIGFzY2VudCA9IGFzY2VudEFuZERlc2NlbnQu YXNjZW50OwotICAgIGF1dG8gZGVzY2VudCA9IGFzY2VudEFuZERlc2NlbnQuZGVzY2VudDsKLQot ICAgIGlmICghaW5saW5lQm94LmlzUHJlZmVycmVkTGluZUhlaWdodEZvbnRNZXRyaWNzQmFzZWQo KSkgewotICAgICAgICAvLyBodHRwczovL3d3dy53My5vcmcvVFIvY3NzLWlubGluZS0zLyNpbmxp bmUtaGVpZ2h0Ci0gICAgICAgIC8vIFdoZW4gY29tcHV0ZWQgbGluZS1oZWlnaHQgaXMgbm90IG5v cm1hbCwgY2FsY3VsYXRlIHRoZSBsZWFkaW5nIEwgYXMgTCA9IGxpbmUtaGVpZ2h0IC0gKEEgKyBE KS4KLSAgICAgICAgLy8gSGFsZiB0aGUgbGVhZGluZyAoaXRzIGhhbGYtbGVhZGluZykgaXMgYWRk ZWQgYWJvdmUgQSwgYW5kIHRoZSBvdGhlciBoYWxmIGJlbG93IEQsCi0gICAgICAgIC8vIGdpdmlu ZyBhbiBlZmZlY3RpdmUgYXNjZW50IGFib3ZlIHRoZSBiYXNlbGluZSBvZiBB4oCyID0gQSArIEwv MiwgYW5kIGFuIGVmZmVjdGl2ZSBkZXNjZW50IG9mIETigLIgPSBEICsgTC8yLgotICAgICAgICBh dXRvIGhhbGZMZWFkaW5nID0gKGlubGluZUJveC5wcmVmZXJyZWRMaW5lSGVpZ2h0KCkgLSAoYXNj ZW50ICsgZGVzY2VudCkpIC8gMjsKLSAgICAgICAgaWYgKCFpc1RleHRCb3hFZGdlTGVhZGluZyhp bmxpbmVCb3gpICYmICFpbmxpbmVCb3guaXNSb290SW5saW5lQm94KCkpIHsKLSAgICAgICAgICAg IC8vIEhvd2V2ZXIsIGlmIHRleHQtYm94LWVkZ2UgaXMgbm90IGxlYWRpbmcgYW5kIHRoaXMgaXMg bm90IHRoZSByb290IGlubGluZSBib3gsIGlmIHRoZSBoYWxmLWxlYWRpbmcgaXMgcG9zaXRpdmUs IHRyZWF0IGl0IGFzIHplcm8uCi0gICAgICAgICAgICBoYWxmTGVhZGluZyA9IHN0ZDo6bWluKGhh bGZMZWFkaW5nLCAwLmYpOwotICAgICAgICB9Ci0gICAgICAgIGFzY2VudCArPSBoYWxmTGVhZGlu ZzsKLSAgICAgICAgZGVzY2VudCArPSBoYWxmTGVhZGluZzsKLSAgICB9IGVsc2UgewotICAgICAg ICAvLyBodHRwczovL3d3dy53My5vcmcvVFIvY3NzLWlubGluZS0zLyNpbmxpbmUtaGVpZ2h0Ci0g ICAgICAgIC8vIElmIGxpbmUtaGVpZ2h0IGNvbXB1dGVzIHRvIG5vcm1hbCBhbmQgZWl0aGVyIHRl eHQtYm94LWVkZ2UgaXMgbGVhZGluZyBvciB0aGlzIGlzIHRoZSByb290IGlubGluZSBib3gsCi0g ICAgICAgIC8vIHRoZSBmb2504oCZcyBsaW5lIGdhcCBtZXRyaWMgbWF5IGFsc28gYmUgaW5jb3Jw b3JhdGVkIGludG8gQSBhbmQgRCBieSBhZGRpbmcgaGFsZiB0byBlYWNoIHNpZGUgYXMgaGFsZi1s ZWFkaW5nLgotICAgICAgICBhdXRvIHNob3VsZEluY29ycG9yYXRlSGFsZkxlYWRpbmcgPSBpbmxp bmVCb3guaXNSb290SW5saW5lQm94KCkgfHwgaXNUZXh0Qm94RWRnZUxlYWRpbmcoaW5saW5lQm94 KTsKLSAgICAgICAgaWYgKHNob3VsZEluY29ycG9yYXRlSGFsZkxlYWRpbmcpIHsKLSAgICAgICAg ICAgIElubGluZUxheW91dFVuaXQgbGluZUdhcCA9IGlubGluZUJveC5wcmltYXJ5bWV0cmljc09m UHJpbWFyeUZvbnQoKS5saW5lU3BhY2luZygpOwotICAgICAgICAgICAgYXV0byBoYWxmTGVhZGlu ZyA9IChsaW5lR2FwIC0gKGFzY2VudCArIGRlc2NlbnQpKSAvIDI7CisgICAgYXV0byBsYXlvdXRC b3VuZHMgPSBbJl0oKSAtPiBJbmxpbmVMZXZlbEJveDo6QXNjZW50QW5kRGVzY2VudCB7CisgICAg ICAgIGF1dG8gW2FzY2VudCwgZGVzY2VudF0gPSBhc2NlbnRBbmREZXNjZW50V2l0aFRleHRCb3hF ZGdlRm9ySW5saW5lQm94KGlubGluZUJveCwgaW5saW5lQm94LnByaW1hcnltZXRyaWNzT2ZQcmlt YXJ5Rm9udCgpLCBmb250QmFzZWxpbmUpOworCisgICAgICAgIGlmICghaW5saW5lQm94LmlzUHJl ZmVycmVkTGluZUhlaWdodEZvbnRNZXRyaWNzQmFzZWQoKSkgeworICAgICAgICAgICAgLy8gaHR0 cHM6Ly93d3cudzMub3JnL1RSL2Nzcy1pbmxpbmUtMy8jaW5saW5lLWhlaWdodAorICAgICAgICAg ICAgLy8gV2hlbiBjb21wdXRlZCBsaW5lLWhlaWdodCBpcyBub3Qgbm9ybWFsLCBjYWxjdWxhdGUg dGhlIGxlYWRpbmcgTCBhcyBMID0gbGluZS1oZWlnaHQgLSAoQSArIEQpLgorICAgICAgICAgICAg Ly8gSGFsZiB0aGUgbGVhZGluZyAoaXRzIGhhbGYtbGVhZGluZykgaXMgYWRkZWQgYWJvdmUgQSwg YW5kIHRoZSBvdGhlciBoYWxmIGJlbG93IEQsCisgICAgICAgICAgICAvLyBnaXZpbmcgYW4gZWZm ZWN0aXZlIGFzY2VudCBhYm92ZSB0aGUgYmFzZWxpbmUgb2YgQeKAsiA9IEEgKyBMLzIsIGFuZCBh biBlZmZlY3RpdmUgZGVzY2VudCBvZiBE4oCyID0gRCArIEwvMi4KKyAgICAgICAgICAgIGF1dG8g aGFsZkxlYWRpbmcgPSAoaW5saW5lQm94LnByZWZlcnJlZExpbmVIZWlnaHQoKSAtIChhc2NlbnQg KyBkZXNjZW50KSkgLyAyOworICAgICAgICAgICAgaWYgKCFpc1RleHRCb3hFZGdlTGVhZGluZyhp bmxpbmVCb3gpICYmICFpbmxpbmVCb3guaXNSb290SW5saW5lQm94KCkpIHsKKyAgICAgICAgICAg ICAgICAvLyBIb3dldmVyLCBpZiB0ZXh0LWJveC1lZGdlIGlzIG5vdCBsZWFkaW5nIGFuZCB0aGlz IGlzIG5vdCB0aGUgcm9vdCBpbmxpbmUgYm94LCBpZiB0aGUgaGFsZi1sZWFkaW5nIGlzIHBvc2l0 aXZlLCB0cmVhdCBpdCBhcyB6ZXJvLgorICAgICAgICAgICAgICAgIGhhbGZMZWFkaW5nID0gc3Rk OjptaW4oaGFsZkxlYWRpbmcsIDAuZik7CisgICAgICAgICAgICB9CiAgICAgICAgICAgICBhc2Nl bnQgKz0gaGFsZkxlYWRpbmc7CiAgICAgICAgICAgICBkZXNjZW50ICs9IGhhbGZMZWFkaW5nOwor ICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgLy8gaHR0cHM6Ly93d3cudzMub3JnL1RSL2Nz cy1pbmxpbmUtMy8jaW5saW5lLWhlaWdodAorICAgICAgICAgICAgLy8gSWYgbGluZS1oZWlnaHQg Y29tcHV0ZXMgdG8gbm9ybWFsIGFuZCBlaXRoZXIgdGV4dC1ib3gtZWRnZSBpcyBsZWFkaW5nIG9y IHRoaXMgaXMgdGhlIHJvb3QgaW5saW5lIGJveCwKKyAgICAgICAgICAgIC8vIHRoZSBmb2504oCZ cyBsaW5lIGdhcCBtZXRyaWMgbWF5IGFsc28gYmUgaW5jb3Jwb3JhdGVkIGludG8gQSBhbmQgRCBi eSBhZGRpbmcgaGFsZiB0byBlYWNoIHNpZGUgYXMgaGFsZi1sZWFkaW5nLgorICAgICAgICAgICAg YXV0byBzaG91bGRJbmNvcnBvcmF0ZUhhbGZMZWFkaW5nID0gaW5saW5lQm94LmlzUm9vdElubGlu ZUJveCgpIHx8IGlzVGV4dEJveEVkZ2VMZWFkaW5nKGlubGluZUJveCk7CisgICAgICAgICAgICBp ZiAoc2hvdWxkSW5jb3Jwb3JhdGVIYWxmTGVhZGluZykgeworICAgICAgICAgICAgICAgIElubGlu ZUxheW91dFVuaXQgbGluZUdhcCA9IGlubGluZUJveC5wcmltYXJ5bWV0cmljc09mUHJpbWFyeUZv bnQoKS5saW5lU3BhY2luZygpOworICAgICAgICAgICAgICAgIGF1dG8gaGFsZkxlYWRpbmcgPSAo bGluZUdhcCAtIChhc2NlbnQgKyBkZXNjZW50KSkgLyAyOworICAgICAgICAgICAgICAgIGFzY2Vu dCArPSBoYWxmTGVhZGluZzsKKyAgICAgICAgICAgICAgICBkZXNjZW50ICs9IGhhbGZMZWFkaW5n OworICAgICAgICAgICAgfQogICAgICAgICB9Ci0gICAgfQotICAgIGlmICghaXNUZXh0Qm94RWRn ZUxlYWRpbmcoaW5saW5lQm94KSAmJiAhaW5saW5lQm94LmlzUm9vdElubGluZUJveCgpKSB7Cisg ICAgICAgIHJldHVybiB7IGFzY2VudCwgZGVzY2VudCB9OworICAgIH0oKTsKKworICAgIGF1dG8g YXBwbHlUZXh0Qm94RWRnZUFkanVzdG1lbnQgPSBbJl0geworICAgICAgICBpZiAoaXNUZXh0Qm94 RWRnZUxlYWRpbmcoaW5saW5lQm94KSB8fCBpbmxpbmVCb3guaXNSb290SW5saW5lQm94KCkpCisg ICAgICAgICAgICByZXR1cm47CiAgICAgICAgIC8vIEFkZGl0aW9uYWxseSwgd2hlbiB0ZXh0LWJv eC1lZGdlIGlzIG5vdCBsZWFkaW5nLCB0aGUgbGF5b3V0IGJvdW5kcyBhcmUgaW5mbGF0ZWQgYnkg dGhlIHN1bSBvZiB0aGUgbWFyZ2luLAogICAgICAgICAvLyBib3JkZXIsIGFuZCBwYWRkaW5nIG9u IGVhY2ggc2lkZS4KICAgICAgICAgQVNTRVJUKCFpbmxpbmVCb3guaXNSb290SW5saW5lQm94KCkp OwogICAgICAgICBhdXRvJiBpbmxpbmVCb3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdDb250ZXh0KCku Z2VvbWV0cnlGb3JCb3goaW5saW5lQm94LmxheW91dEJveCgpKTsKLSAgICAgICAgYXNjZW50ICs9 IGlubGluZUJveEdlb21ldHJ5Lm1hcmdpbkJvcmRlckFuZFBhZGRpbmdCZWZvcmUoKTsKLSAgICAg ICAgZGVzY2VudCArPSBpbmxpbmVCb3hHZW9tZXRyeS5tYXJnaW5Cb3JkZXJBbmRQYWRkaW5nQWZ0 ZXIoKTsKLSAgICB9Ci0gICAgaW5saW5lQm94LnNldExheW91dEJvdW5kcyh7IGZsb29yZihhc2Nl bnQpLCBjZWlsZihkZXNjZW50KSB9KTsKKyAgICAgICAgbGF5b3V0Qm91bmRzLmFzY2VudCArPSBp bmxpbmVCb3hHZW9tZXRyeS5tYXJnaW5Cb3JkZXJBbmRQYWRkaW5nQmVmb3JlKCk7CisgICAgICAg IGxheW91dEJvdW5kcy5kZXNjZW50ICs9IGlubGluZUJveEdlb21ldHJ5Lm1hcmdpbkJvcmRlckFu ZFBhZGRpbmdBZnRlcigpOworICAgIH07CisgICAgYXBwbHlUZXh0Qm94RWRnZUFkanVzdG1lbnQo KTsKKworICAgIGxheW91dEJvdW5kcy5yb3VuZCgpOworICAgIGlubGluZUJveC5zZXRMYXlvdXRC b3VuZHMobGF5b3V0Qm91bmRzKTsKIH0KIAogdm9pZCBMaW5lQm94QnVpbGRlcjo6c2V0VmVydGlj YWxQcm9wZXJ0aWVzRm9ySW5saW5lTGV2ZWxCb3goY29uc3QgTGluZUJveCYgbGluZUJveCwgSW5s aW5lTGV2ZWxCb3gmIGlubGluZUxldmVsQm94KSBjb25zdApAQCAtMjQ0LDkgKzI1MiwxMSBAQCB2 b2lkIExpbmVCb3hCdWlsZGVyOjpzZXRWZXJ0aWNhbFByb3BlcnRpZXNGb3JJbmxpbmVMZXZlbEJv eChjb25zdCBMaW5lQm94JiBsaW5lQgogICAgICAgICAgICAgICAgIHJldHVybiBwcmltYXJ5Rm9u dE1ldHJpY3NGb3JJbmxpbmVCb3goaW5saW5lTGV2ZWxCb3gsIGZvbnRCYXNlbGluZSk7CiAKICAg ICAgICAgICAgIGF1dG8mIGZvbnRNZXRyaWNzID0gaW5saW5lTGV2ZWxCb3gucHJpbWFyeW1ldHJp Y3NPZlByaW1hcnlGb250KCk7Ci0gICAgICAgICAgICBhdXRvIGFzY2VudEFuZERlc2NlbnQgPSBh c2NlbnRBbmREZXNjZW50V2l0aFRleHRCb3hFZGdlRm9ySW5saW5lQm94KGlubGluZUxldmVsQm94 LCBmb250TWV0cmljcywgZm9udEJhc2VsaW5lKTsKLSAgICAgICAgICAgIGF1dG8gYXNjZW50ID0g dGV4dEJveFRyaW0gPT0gVGV4dEJveFRyaW06OkVuZCA/IGZvbnRNZXRyaWNzLmFzY2VudChmb250 QmFzZWxpbmUpIDogYXNjZW50QW5kRGVzY2VudC5hc2NlbnQ7Ci0gICAgICAgICAgICBhdXRvIGRl c2NlbnQgPSB0ZXh0Qm94VHJpbSA9PSBUZXh0Qm94VHJpbTo6U3RhcnQgPyBmb250TWV0cmljcy5k ZXNjZW50KGZvbnRCYXNlbGluZSkgOiBhc2NlbnRBbmREZXNjZW50LmRlc2NlbnQ7CisgICAgICAg ICAgICBhdXRvIFthc2NlbnQsIGRlc2NlbnRdID0gYXNjZW50QW5kRGVzY2VudFdpdGhUZXh0Qm94 RWRnZUZvcklubGluZUJveChpbmxpbmVMZXZlbEJveCwgZm9udE1ldHJpY3MsIGZvbnRCYXNlbGlu ZSk7CisgICAgICAgICAgICBpZiAodGV4dEJveFRyaW0gPT0gVGV4dEJveFRyaW06OkVuZCkKKyAg ICAgICAgICAgICAgICBhc2NlbnQgPSBmb250TWV0cmljcy5hc2NlbnQoZm9udEJhc2VsaW5lKTsK KyAgICAgICAgICAgIGlmICh0ZXh0Qm94VHJpbSA9PSBUZXh0Qm94VHJpbTo6U3RhcnQpCisgICAg ICAgICAgICAgICAgZGVzY2VudCA9IGZvbnRNZXRyaWNzLmRlc2NlbnQoZm9udEJhc2VsaW5lKTsK ICAgICAgICAgICAgIHJldHVybiB7IGFzY2VudCwgZGVzY2VudCB9OwogICAgICAgICB9KCk7CiAK QEAgLTQ2MywxMSArNDczLDExIEBAIHZvaWQgTGluZUJveEJ1aWxkZXI6OmFkanVzdElubGluZUJv eEhlaWdodHNGb3JMaW5lQm94Q29udGFpbklmQXBwbGljYWJsZShMaW5lQm94CiAgICAgICAgIC8v IEFzc2lnbiBmb250IGJhc2VkIGxheW91dCBib3VuZHMgdG8gYWxsIGlubGluZSBib3hlcy4KICAg ICAgICAgYXV0byBlbnN1cmVGb250TWV0cmljc0Jhc2VkSGVpZ2h0ID0gWyZdIChhdXRvJiBpbmxp bmVCb3gpIHsKICAgICAgICAgICAgIEFTU0VSVChpbmxpbmVCb3guaXNJbmxpbmVCb3goKSk7Ci0g ICAgICAgICAgICBhdXRvIGFzY2VudEFuZERlc2NlbnQgPSBwcmltYXJ5Rm9udE1ldHJpY3NGb3JJ bmxpbmVCb3goaW5saW5lQm94LCBsaW5lQm94LmJhc2VsaW5lVHlwZSgpKTsKKyAgICAgICAgICAg IGF1dG8gW2FzY2VudCwgZGVzY2VudF0gPSBwcmltYXJ5Rm9udE1ldHJpY3NGb3JJbmxpbmVCb3go aW5saW5lQm94LCBsaW5lQm94LmJhc2VsaW5lVHlwZSgpKTsKICAgICAgICAgICAgIElubGluZUxh eW91dFVuaXQgbGluZUdhcCA9IGlubGluZUJveC5wcmltYXJ5bWV0cmljc09mUHJpbWFyeUZvbnQo KS5saW5lU3BhY2luZygpOwotICAgICAgICAgICAgYXV0byBoYWxmTGVhZGluZyA9IChsaW5lR2Fw IC0gYXNjZW50QW5kRGVzY2VudC5oZWlnaHQoKSkgLyAyOwotICAgICAgICAgICAgYXV0byBhc2Nl bnQgPSBhc2NlbnRBbmREZXNjZW50LmFzY2VudCArIGhhbGZMZWFkaW5nOwotICAgICAgICAgICAg YXV0byBkZXNjZW50ID0gYXNjZW50QW5kRGVzY2VudC5kZXNjZW50ICsgaGFsZkxlYWRpbmc7Cisg ICAgICAgICAgICBhdXRvIGhhbGZMZWFkaW5nID0gKGxpbmVHYXAgLSAoYXNjZW50ICsgZGVzY2Vu dCkpIC8gMjsKKyAgICAgICAgICAgIGFzY2VudCArPSBoYWxmTGVhZGluZzsKKyAgICAgICAgICAg IGRlc2NlbnQgKz0gaGFsZkxlYWRpbmc7CiAgICAgICAgICAgICBpZiAoYXV0byBmYWxsYmFja0Zv bnRzID0gbV9mYWxsYmFja0ZvbnRzRm9ySW5saW5lQm94ZXMuZ2V0KCZpbmxpbmVCb3gpOyAhZmFs bGJhY2tGb250cy5pc0VtcHR5SWdub3JpbmdOdWxsUmVmZXJlbmNlcygpKSB7CiAgICAgICAgICAg ICAgICAgYXV0byBlbmNsb3NpbmdBc2NlbnRBbmREZXNjZW50ID0gZW5jbG9zaW5nQXNjZW50RGVz Y2VudFdpdGhGYWxsYmFja0ZvbnRzKGlubGluZUJveCwgZmFsbGJhY2tGb250cywgbGluZUJveC5i YXNlbGluZVR5cGUoKSk7CiAgICAgICAgICAgICAgICAgYXNjZW50ID0gc3RkOjptYXgoYXNjZW50 LCBlbmNsb3NpbmdBc2NlbnRBbmREZXNjZW50LmFzY2VudCk7Cg==