198611 2019-06-06 07:48:45 -0700 [LFC][IFC] Move baseline and line height computation to a dedicated function 2019-06-06 09:53:36 -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 1542405 0 zalan 2019-06-06 07:48:45 -0700 This is in preparation for adding vertical alignment support. 1542406 1 webkit-bug-importer 2019-06-06 07:49:05 -0700 <rdar://problem/51482708> 1542409 2 371496 zalan 2019-06-06 07:54:14 -0700 Created attachment 371496 Patch 1542444 3 371504 zalan 2019-06-06 09:37:39 -0700 Created attachment 371504 Patch 1542453 4 371504 commit-queue 2019-06-06 09:53:35 -0700 Comment on attachment 371504 Patch Clearing flags on attachment: 371504 Committed r246158: <https://trac.webkit.org/changeset/246158> 1542454 5 commit-queue 2019-06-06 09:53:36 -0700 All reviewed patches have been landed. Closing bug. 371496 2019-06-06 07:54:14 -0700 2019-06-06 09:37:38 -0700 Patch bug-198611-20190606075410.patch text/plain 6763 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2MTUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGZjNmQzNzJjZGQ2M2Jh ZDRjNDY4OTViNjdiYTlmZThkMzE2ZDIzNS4uZTU2NDY4NGNkYTg2YzA2ZjExNDRkNTMxN2IzODNi YjE4NTZiZWJkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE5LTA2LTA2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBNb3ZlIGJh c2VsaW5lIGFuZCBsaW5lIGhlaWdodCBjb21wdXRhdGlvbiB0byBhIGRlZGljYXRlZCBmdW5jdGlv bgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk4NjEx CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MTQ4MjcwOD4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciBh ZGRpbmcgdmVydGljYWwgYWxpZ21lbnQuCisKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVMaW5lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6YXBw ZW5kSW5saW5lQ29udGFpbmVyU3RhcnQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5l OjphcHBlbmROb25SZXBsYWNlZElubGluZUJveCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OkxpbmU6OmFkanVzdEJhc2VsaW5lQW5kTGluZUhlaWdodCk6CisgICAgICAgICogbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oOgorCiAyMDE5LTA2LTA2ICBaYWxhbiBCdWp0YXMg IDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBMYXlvdXQgYW5kIHByZWZl cnJlZCB3aWR0aCBjb21wdXRhdGlvbiBzaG91bGQgYm90aCBjYWxsIHBsYWNlSW5saW5lSXRlbXMo KS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUxpbmUuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lTGluZS5jcHAKaW5kZXggMDc0MDVhZTc0NzQ3MWQ1MmZiMzUzYWNlNDk4YTJjYzliODdlZjZh My4uY2U4MGQ3YTM4ZjBmMjZkYThiZTMxZTE2NDcwMzk4NjcyYjcxNmIwMyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHAK QEAgLTEyMSwyMiArMTIxLDEyIEBAIHZvaWQgTGluZTo6YXBwZW5kTm9uQnJlYWthYmxlU3BhY2Uo Y29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSwgY29uc3QgRGlzcGxheTo6CiAKIHZvaWQgTGlu ZTo6YXBwZW5kSW5saW5lQ29udGFpbmVyU3RhcnQoY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRl bSwgSW5saW5lSXRlbVNpemUgcnVuU2l6ZSkKIHsKLSAgICBhdXRvJiBsYXlvdXRCb3ggPSBpbmxp bmVJdGVtLmxheW91dEJveCgpOwotICAgIGF1dG8mIHN0eWxlID0gbGF5b3V0Qm94LnN0eWxlKCk7 Ci0gICAgYXV0byYgZm9udE1ldHJpY3MgPSBzdHlsZS5mb250TWV0cmljcygpOwotCi0gICAgYXV0 byBhbGlnbkFuZEFkanVzdExpbmVIZWlnaHQgPSBbJl0gewotICAgICAgICBMYXlvdXRVbml0IGlu bGluZUJveEhlaWdodCA9IHN0eWxlLmNvbXB1dGVkTGluZUhlaWdodCgpOwotCi0gICAgICAgIGF1 dG8gaGFsZkxlYWRpbmcgPSBoYWxmTGVhZGluZ01ldHJpY3MoZm9udE1ldHJpY3MsIGlubGluZUJv eEhlaWdodCk7Ci0gICAgICAgIGlmIChoYWxmTGVhZGluZy5kZXB0aCA+IDApCi0gICAgICAgICAg ICBtX2xvZ2ljYWxIZWlnaHQuZGVwdGggPSBzdGQ6Om1heChtX2xvZ2ljYWxIZWlnaHQuZGVwdGgs IGhhbGZMZWFkaW5nLmRlcHRoKTsKLSAgICAgICAgaWYgKGhhbGZMZWFkaW5nLmhlaWdodCA+IDAp Ci0gICAgICAgICAgICBtX2xvZ2ljYWxIZWlnaHQuaGVpZ2h0ID0gc3RkOjptYXgobV9sb2dpY2Fs SGVpZ2h0LmhlaWdodCwgaGFsZkxlYWRpbmcuaGVpZ2h0KTsKLSAgICB9OworICAgIGFkanVzdEJh c2VsaW5lQW5kTGluZUhlaWdodChpbmxpbmVJdGVtKTsKIAotICAgIGFsaWduQW5kQWRqdXN0TGlu ZUhlaWdodCgpOworICAgIGF1dG8mIGxheW91dEJveCA9IGlubGluZUl0ZW0ubGF5b3V0Qm94KCk7 CisgICAgYXV0byYgZm9udE1ldHJpY3MgPSBsYXlvdXRCb3guc3R5bGUoKS5mb250TWV0cmljcygp OwogICAgIGF1dG8mIGRpc3BsYXlCb3ggPSBtX2xheW91dFN0YXRlLmRpc3BsYXlCb3hGb3JMYXlv dXRCb3gobGF5b3V0Qm94KTsKKwogICAgIGF1dG8gbG9naWNhbFRvcCA9IC1mb250TWV0cmljcy5h c2NlbnQoKSAtIGRpc3BsYXlCb3guYm9yZGVyVG9wKCkgLSBkaXNwbGF5Qm94LnBhZGRpbmdUb3Ao KS52YWx1ZU9yKDApOwogICAgIGF1dG8gbG9naWNhbFJlY3QgPSBEaXNwbGF5OjpSZWN0IHsgbG9n aWNhbFRvcCwgY29udGVudExvZ2ljYWxSaWdodCgpLCBydW5TaXplLmxvZ2ljYWxXaWR0aCwgcnVu U2l6ZS5sb2dpY2FsSGVpZ2h0LnZhbHVlT3IoMCkgfTsKICAgICBhcHBlbmROb25CcmVha2FibGVT cGFjZShpbmxpbmVJdGVtLCBsb2dpY2FsUmVjdCk7CkBAIC0xOTEsMjMgKzE4MSw5IEBAIHZvaWQg TGluZTo6YXBwZW5kVGV4dENvbnRlbnQoY29uc3QgSW5saW5lVGV4dEl0ZW0mIGlubGluZUl0ZW0s IElubGluZUl0ZW1TaXplIHJ1CiAKIHZvaWQgTGluZTo6YXBwZW5kTm9uUmVwbGFjZWRJbmxpbmVC b3goY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSwgSW5saW5lSXRlbVNpemUgcnVuU2l6ZSkK IHsKLSAgICBhdXRvIGlubGluZUJveEhlaWdodCA9IHJ1blNpemUubG9naWNhbEhlaWdodC52YWx1 ZU9yKDApOwotICAgIGF1dG8gYWxpZ25BbmRBZGp1c3RMaW5lSGVpZ2h0ID0gWyZdIHsKLSAgICAg ICAgLy8gRklYTUU6IFdlIG5lZWQgdG8gbG9vayBpbnNpZGUgdGhlIGlubGluZS1ibG9jaydzIGZv cm1hdHRpbmcgY29udGV4dCBhbmQgY2hlY2sgdGhlIGxpbmVib3hlcyAoaWYgYW55KSB0byBiZSBh YmxlIHRvIGJhc2VsaW5lIGFsaWduLgotICAgICAgICBpZiAoaW5saW5lSXRlbS5sYXlvdXRCb3go KS5lc3RhYmxpc2hlc0lubGluZUZvcm1hdHRpbmdDb250ZXh0KCkpIHsKLSAgICAgICAgICAgIGlm IChpbmxpbmVCb3hIZWlnaHQgPT0gbG9naWNhbEhlaWdodCgpKQotICAgICAgICAgICAgICAgIHJl dHVybjsKLSAgICAgICAgICAgIC8vIEZJWE1FOiBUaGlzIGZhaWxzIHdoZW4gdGhlIGxpbmUgaGVp Z2h0IGRpZmZlcmVuY2UgY29tZXMgZnJvbSBmb250LXNpemUgZGlmZi4KLSAgICAgICAgICAgIG1f bG9naWNhbEhlaWdodC5kZXB0aCA9IHN0ZDo6bWF4PExheW91dFVuaXQ+KDAsIG1fbG9naWNhbEhl aWdodC5kZXB0aCk7Ci0gICAgICAgICAgICBtX2xvZ2ljYWxIZWlnaHQuaGVpZ2h0ID0gc3RkOjpt YXgoaW5saW5lQm94SGVpZ2h0LCBtX2xvZ2ljYWxIZWlnaHQuaGVpZ2h0KTsKLSAgICAgICAgICAg IHJldHVybjsKLSAgICAgICAgfQotICAgICAgICAvLyAwIGRlc2NlbnQgLT4gYmFzZWxpbmUgYWxp Z21lbnQgZm9yIG5vdy4KLSAgICAgICAgbV9sb2dpY2FsSGVpZ2h0LmRlcHRoID0gc3RkOjptYXg8 TGF5b3V0VW5pdD4oMCwgbV9sb2dpY2FsSGVpZ2h0LmRlcHRoKTsKLSAgICAgICAgbV9sb2dpY2Fs SGVpZ2h0LmhlaWdodCA9IHN0ZDo6bWF4KGlubGluZUJveEhlaWdodCwgbV9sb2dpY2FsSGVpZ2h0 LmhlaWdodCk7Ci0gICAgfTsKKyAgICBhZGp1c3RCYXNlbGluZUFuZExpbmVIZWlnaHQoaW5saW5l SXRlbSk7CiAKLSAgICBhbGlnbkFuZEFkanVzdExpbmVIZWlnaHQoKTsKKyAgICBhdXRvIGlubGlu ZUJveEhlaWdodCA9IHJ1blNpemUubG9naWNhbEhlaWdodC52YWx1ZU9yKDApOwogICAgIGF1dG8m IGRpc3BsYXlCb3ggPSBtX2xheW91dFN0YXRlLmRpc3BsYXlCb3hGb3JMYXlvdXRCb3goaW5saW5l SXRlbS5sYXlvdXRCb3goKSk7CiAgICAgYXV0byBsb2dpY2FsVG9wID0gLWlubGluZUJveEhlaWdo dDsKICAgICBhdXRvIGhvcml6b250YWxNYXJnaW4gPSBkaXNwbGF5Qm94Lmhvcml6b250YWxNYXJn aW4oKTsKQEAgLTIzMSw2ICsyMDcsMzcgQEAgdm9pZCBMaW5lOjphcHBlbmRIYXJkTGluZUJyZWFr KGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0pCiAgICAgbV9jb250ZW50LT5ydW5zKCkuYXBw ZW5kKHN0ZDo6bWFrZV91bmlxdWU8Q29udGVudDo6UnVuPihEaXNwbGF5OjpSdW4geyBsb2dpY2Fs UmVjdCB9LCBpbmxpbmVJdGVtLCBmYWxzZSwgZmFsc2UpKTsKIH0KIAordm9pZCBMaW5lOjphZGp1 c3RCYXNlbGluZUFuZExpbmVIZWlnaHQoY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSkKK3sK KyAgICBBU1NFUlQoIWlubGluZUl0ZW0uaXNDb250YWluZXJFbmQoKSAmJiAhaW5saW5lSXRlbS5p c1RleHQoKSk7CisgICAgYXV0byYgbGF5b3V0Qm94ID0gaW5saW5lSXRlbS5sYXlvdXRCb3goKTsK KyAgICBhdXRvJiBzdHlsZSA9IGxheW91dEJveC5zdHlsZSgpOworICAgIExheW91dFVuaXQgaW5s aW5lQm94SGVpZ2h0ID0gc3R5bGUuY29tcHV0ZWRMaW5lSGVpZ2h0KCk7CisKKyAgICBpZiAoaW5s aW5lSXRlbS5pc0NvbnRhaW5lclN0YXJ0KCkpIHsKKyAgICAgICAgYXV0byYgZm9udE1ldHJpY3Mg PSBzdHlsZS5mb250TWV0cmljcygpOworICAgICAgICBhdXRvIGhhbGZMZWFkaW5nID0gaGFsZkxl YWRpbmdNZXRyaWNzKGZvbnRNZXRyaWNzLCBpbmxpbmVCb3hIZWlnaHQpOworICAgICAgICBpZiAo aGFsZkxlYWRpbmcuZGVwdGggPiAwKQorICAgICAgICAgICAgbV9sb2dpY2FsSGVpZ2h0LmRlcHRo ID0gc3RkOjptYXgobV9sb2dpY2FsSGVpZ2h0LmRlcHRoLCBoYWxmTGVhZGluZy5kZXB0aCk7Cisg ICAgICAgIGlmIChoYWxmTGVhZGluZy5oZWlnaHQgPiAwKQorICAgICAgICAgICAgbV9sb2dpY2Fs SGVpZ2h0LmhlaWdodCA9IHN0ZDo6bWF4KG1fbG9naWNhbEhlaWdodC5oZWlnaHQsIGhhbGZMZWFk aW5nLmhlaWdodCk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgLy8gUmVwbGFjZWQgYW5k IG5vbi1yZXBsYWNlZCBpbmxpbmUgbGV2ZWwgYm94LgorICAgIC8vIEZJWE1FOiBXZSBuZWVkIHRv IGxvb2sgaW5zaWRlIHRoZSBpbmxpbmUtYmxvY2sncyBmb3JtYXR0aW5nIGNvbnRleHQgYW5kIGNo ZWNrIHRoZSBsaW5lYm94ZXMgKGlmIGFueSkgdG8gYmUgYWJsZSB0byBiYXNlbGluZSBhbGlnbi4K KyAgICBpZiAobGF5b3V0Qm94LmVzdGFibGlzaGVzSW5saW5lRm9ybWF0dGluZ0NvbnRleHQoKSkg eworICAgICAgICBpZiAoaW5saW5lQm94SGVpZ2h0ID09IGxvZ2ljYWxIZWlnaHQoKSkKKyAgICAg ICAgICAgIHJldHVybjsKKyAgICAgICAgLy8gRklYTUU6IFRoaXMgZmFpbHMgd2hlbiB0aGUgbGlu ZSBoZWlnaHQgZGlmZmVyZW5jZSBjb21lcyBmcm9tIGZvbnQtc2l6ZSBkaWZmLgorICAgICAgICBt X2xvZ2ljYWxIZWlnaHQuZGVwdGggPSBzdGQ6Om1heDxMYXlvdXRVbml0PigwLCBtX2xvZ2ljYWxI ZWlnaHQuZGVwdGgpOworICAgICAgICBtX2xvZ2ljYWxIZWlnaHQuaGVpZ2h0ID0gc3RkOjptYXgo aW5saW5lQm94SGVpZ2h0LCBtX2xvZ2ljYWxIZWlnaHQuaGVpZ2h0KTsKKyAgICAgICAgcmV0dXJu OworICAgIH0KKyAgICAvLyAwIGRlc2NlbnQgLT4gYmFzZWxpbmUgYWxpZ21lbnQgZm9yIG5vdy4K KyAgICBtX2xvZ2ljYWxIZWlnaHQuZGVwdGggPSBzdGQ6Om1heDxMYXlvdXRVbml0PigwLCBtX2xv Z2ljYWxIZWlnaHQuZGVwdGgpOworICAgIG1fbG9naWNhbEhlaWdodC5oZWlnaHQgPSBzdGQ6Om1h eChpbmxpbmVCb3hIZWlnaHQsIG1fbG9naWNhbEhlaWdodC5oZWlnaHQpOworfQorCiBMaW5lOjpV c2VkSGVpZ2h0QW5kRGVwdGggTGluZTo6aGFsZkxlYWRpbmdNZXRyaWNzKGNvbnN0IEZvbnRNZXRy aWNzJiBmb250TWV0cmljcywgTGF5b3V0VW5pdCBsaW5lTG9naWNhbEhlaWdodCkKIHsKICAgICBh dXRvIGFzY2VudCA9IGZvbnRNZXRyaWNzLmFzY2VudCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oCmluZGV4IDU4NTc0OTlkNjc5 N2MwNjI3MGZjOTEzYTgzZGU2NmU3YjRhYjM2NDguLjM0OWQ1ZGRiZTE3ZTkzM2IwNThmZDNkZThl ZmIwZDExZDg2M2EwY2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUxpbmUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVMaW5lLmgKQEAgLTExNiw2ICsxMTYsOCBAQCBwcml2YXRlOgogICAg IHZvaWQgYXBwZW5kTm9uQnJlYWthYmxlU3BhY2UoY29uc3QgSW5saW5lSXRlbSYsIGNvbnN0IERp c3BsYXk6OlJlY3QmIGxvZ2ljYWxSZWN0KTsKICAgICB2b2lkIHJlbW92ZVRyYWlsaW5nVHJpbW1h YmxlQ29udGVudCgpOwogCisgICAgdm9pZCBhZGp1c3RCYXNlbGluZUFuZExpbmVIZWlnaHQoY29u c3QgSW5saW5lSXRlbSYpOworCiAgICAgY29uc3QgTGF5b3V0U3RhdGUmIG1fbGF5b3V0U3RhdGU7 CiAgICAgc3RkOjp1bmlxdWVfcHRyPENvbnRlbnQ+IG1fY29udGVudDsKICAgICBMaXN0SGFzaFNl dDxDb250ZW50OjpSdW4qPiBtX3RyaW1tYWJsZUNvbnRlbnQ7Cg== 371504 2019-06-06 09:37:39 -0700 2019-06-06 09:53:35 -0700 Patch bug-198611-20190606093735.patch text/plain 6859 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2MTUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGZjNmQzNzJjZGQ2M2Jh ZDRjNDY4OTViNjdiYTlmZThkMzE2ZDIzNS4uNWQ2MTMxN2Y2NjlhNTQwZWEzYzRhYmU1M2FiNzE2 YTBhOGVjMWE2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE5LTA2LTA2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBNb3ZlIGJh c2VsaW5lIGFuZCBsaW5lIGhlaWdodCBjb21wdXRhdGlvbiB0byBhIGRlZGljYXRlZCBmdW5jdGlv bgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk4NjEx CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81MTQ4MjcwOD4KKworICAgICAgICBSZXZpZXdlZCBi eSBBbnR0aSBLb2l2aXN0by4KKworICAgICAgICBUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciBh ZGRpbmcgdmVydGljYWwgYWxpZ21lbnQuCisKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0 dGluZy9JbmxpbmVMaW5lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6YXBw ZW5kSW5saW5lQ29udGFpbmVyU3RhcnQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5l OjphcHBlbmROb25SZXBsYWNlZElubGluZUJveCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OkxpbmU6OmFkanVzdEJhc2VsaW5lQW5kTGluZUhlaWdodCk6CisgICAgICAgICogbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oOgorCiAyMDE5LTA2LTA2ICBaYWxhbiBCdWp0YXMg IDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBMYXlvdXQgYW5kIHByZWZl cnJlZCB3aWR0aCBjb21wdXRhdGlvbiBzaG91bGQgYm90aCBjYWxsIHBsYWNlSW5saW5lSXRlbXMo KS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lu bGluZUxpbmUuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lTGluZS5jcHAKaW5kZXggMDc0MDVhZTc0NzQ3MWQ1MmZiMzUzYWNlNDk4YTJjYzliODdlZjZh My4uMWE0ZWMyNThkYTU0MmEyYzE5ZGYyODljODIyNGQxNmUxYmZmZGRkZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHAK QEAgLTEyMSwyMiArMTIxLDEzIEBAIHZvaWQgTGluZTo6YXBwZW5kTm9uQnJlYWthYmxlU3BhY2Uo Y29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRlbSwgY29uc3QgRGlzcGxheTo6CiAKIHZvaWQgTGlu ZTo6YXBwZW5kSW5saW5lQ29udGFpbmVyU3RhcnQoY29uc3QgSW5saW5lSXRlbSYgaW5saW5lSXRl bSwgSW5saW5lSXRlbVNpemUgcnVuU2l6ZSkKIHsKLSAgICBhdXRvJiBsYXlvdXRCb3ggPSBpbmxp bmVJdGVtLmxheW91dEJveCgpOwotICAgIGF1dG8mIHN0eWxlID0gbGF5b3V0Qm94LnN0eWxlKCk7 Ci0gICAgYXV0byYgZm9udE1ldHJpY3MgPSBzdHlsZS5mb250TWV0cmljcygpOwotCi0gICAgYXV0 byBhbGlnbkFuZEFkanVzdExpbmVIZWlnaHQgPSBbJl0gewotICAgICAgICBMYXlvdXRVbml0IGlu bGluZUJveEhlaWdodCA9IHN0eWxlLmNvbXB1dGVkTGluZUhlaWdodCgpOwotCi0gICAgICAgIGF1 dG8gaGFsZkxlYWRpbmcgPSBoYWxmTGVhZGluZ01ldHJpY3MoZm9udE1ldHJpY3MsIGlubGluZUJv eEhlaWdodCk7Ci0gICAgICAgIGlmIChoYWxmTGVhZGluZy5kZXB0aCA+IDApCi0gICAgICAgICAg ICBtX2xvZ2ljYWxIZWlnaHQuZGVwdGggPSBzdGQ6Om1heChtX2xvZ2ljYWxIZWlnaHQuZGVwdGgs IGhhbGZMZWFkaW5nLmRlcHRoKTsKLSAgICAgICAgaWYgKGhhbGZMZWFkaW5nLmhlaWdodCA+IDAp Ci0gICAgICAgICAgICBtX2xvZ2ljYWxIZWlnaHQuaGVpZ2h0ID0gc3RkOjptYXgobV9sb2dpY2Fs SGVpZ2h0LmhlaWdodCwgaGFsZkxlYWRpbmcuaGVpZ2h0KTsKLSAgICB9OworICAgIGlmIChydW5T aXplLmxvZ2ljYWxIZWlnaHQpCisgICAgICAgIGFkanVzdEJhc2VsaW5lQW5kTGluZUhlaWdodChp bmxpbmVJdGVtLCAqcnVuU2l6ZS5sb2dpY2FsSGVpZ2h0KTsKIAotICAgIGFsaWduQW5kQWRqdXN0 TGluZUhlaWdodCgpOworICAgIGF1dG8mIGxheW91dEJveCA9IGlubGluZUl0ZW0ubGF5b3V0Qm94 KCk7CisgICAgYXV0byYgZm9udE1ldHJpY3MgPSBsYXlvdXRCb3guc3R5bGUoKS5mb250TWV0cmlj cygpOwogICAgIGF1dG8mIGRpc3BsYXlCb3ggPSBtX2xheW91dFN0YXRlLmRpc3BsYXlCb3hGb3JM YXlvdXRCb3gobGF5b3V0Qm94KTsKKwogICAgIGF1dG8gbG9naWNhbFRvcCA9IC1mb250TWV0cmlj cy5hc2NlbnQoKSAtIGRpc3BsYXlCb3guYm9yZGVyVG9wKCkgLSBkaXNwbGF5Qm94LnBhZGRpbmdU b3AoKS52YWx1ZU9yKDApOwogICAgIGF1dG8gbG9naWNhbFJlY3QgPSBEaXNwbGF5OjpSZWN0IHsg bG9naWNhbFRvcCwgY29udGVudExvZ2ljYWxSaWdodCgpLCBydW5TaXplLmxvZ2ljYWxXaWR0aCwg cnVuU2l6ZS5sb2dpY2FsSGVpZ2h0LnZhbHVlT3IoMCkgfTsKICAgICBhcHBlbmROb25CcmVha2Fi bGVTcGFjZShpbmxpbmVJdGVtLCBsb2dpY2FsUmVjdCk7CkBAIC0xOTEsMjMgKzE4MiwxMCBAQCB2 b2lkIExpbmU6OmFwcGVuZFRleHRDb250ZW50KGNvbnN0IElubGluZVRleHRJdGVtJiBpbmxpbmVJ dGVtLCBJbmxpbmVJdGVtU2l6ZSBydQogCiB2b2lkIExpbmU6OmFwcGVuZE5vblJlcGxhY2VkSW5s aW5lQm94KGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIElubGluZUl0ZW1TaXplIHJ1blNp emUpCiB7Ci0gICAgYXV0byBpbmxpbmVCb3hIZWlnaHQgPSBydW5TaXplLmxvZ2ljYWxIZWlnaHQu dmFsdWVPcigwKTsKLSAgICBhdXRvIGFsaWduQW5kQWRqdXN0TGluZUhlaWdodCA9IFsmXSB7Ci0g ICAgICAgIC8vIEZJWE1FOiBXZSBuZWVkIHRvIGxvb2sgaW5zaWRlIHRoZSBpbmxpbmUtYmxvY2sn cyBmb3JtYXR0aW5nIGNvbnRleHQgYW5kIGNoZWNrIHRoZSBsaW5lYm94ZXMgKGlmIGFueSkgdG8g YmUgYWJsZSB0byBiYXNlbGluZSBhbGlnbi4KLSAgICAgICAgaWYgKGlubGluZUl0ZW0ubGF5b3V0 Qm94KCkuZXN0YWJsaXNoZXNJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCgpKSB7Ci0gICAgICAgICAg ICBpZiAoaW5saW5lQm94SGVpZ2h0ID09IGxvZ2ljYWxIZWlnaHQoKSkKLSAgICAgICAgICAgICAg ICByZXR1cm47Ci0gICAgICAgICAgICAvLyBGSVhNRTogVGhpcyBmYWlscyB3aGVuIHRoZSBsaW5l IGhlaWdodCBkaWZmZXJlbmNlIGNvbWVzIGZyb20gZm9udC1zaXplIGRpZmYuCi0gICAgICAgICAg ICBtX2xvZ2ljYWxIZWlnaHQuZGVwdGggPSBzdGQ6Om1heDxMYXlvdXRVbml0PigwLCBtX2xvZ2lj YWxIZWlnaHQuZGVwdGgpOwotICAgICAgICAgICAgbV9sb2dpY2FsSGVpZ2h0LmhlaWdodCA9IHN0 ZDo6bWF4KGlubGluZUJveEhlaWdodCwgbV9sb2dpY2FsSGVpZ2h0LmhlaWdodCk7Ci0gICAgICAg ICAgICByZXR1cm47Ci0gICAgICAgIH0KLSAgICAgICAgLy8gMCBkZXNjZW50IC0+IGJhc2VsaW5l IGFsaWdtZW50IGZvciBub3cuCi0gICAgICAgIG1fbG9naWNhbEhlaWdodC5kZXB0aCA9IHN0ZDo6 bWF4PExheW91dFVuaXQ+KDAsIG1fbG9naWNhbEhlaWdodC5kZXB0aCk7Ci0gICAgICAgIG1fbG9n aWNhbEhlaWdodC5oZWlnaHQgPSBzdGQ6Om1heChpbmxpbmVCb3hIZWlnaHQsIG1fbG9naWNhbEhl aWdodC5oZWlnaHQpOwotICAgIH07CisgICAgaWYgKHJ1blNpemUubG9naWNhbEhlaWdodCkKKyAg ICAgICAgYWRqdXN0QmFzZWxpbmVBbmRMaW5lSGVpZ2h0KGlubGluZUl0ZW0sICpydW5TaXplLmxv Z2ljYWxIZWlnaHQpOwogCi0gICAgYWxpZ25BbmRBZGp1c3RMaW5lSGVpZ2h0KCk7CisgICAgYXV0 byBpbmxpbmVCb3hIZWlnaHQgPSBydW5TaXplLmxvZ2ljYWxIZWlnaHQudmFsdWVPcigwKTsKICAg ICBhdXRvJiBkaXNwbGF5Qm94ID0gbV9sYXlvdXRTdGF0ZS5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94 KGlubGluZUl0ZW0ubGF5b3V0Qm94KCkpOwogICAgIGF1dG8gbG9naWNhbFRvcCA9IC1pbmxpbmVC b3hIZWlnaHQ7CiAgICAgYXV0byBob3Jpem9udGFsTWFyZ2luID0gZGlzcGxheUJveC5ob3Jpem9u dGFsTWFyZ2luKCk7CkBAIC0yMzEsNiArMjA5LDM2IEBAIHZvaWQgTGluZTo6YXBwZW5kSGFyZExp bmVCcmVhayhjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtKQogICAgIG1fY29udGVudC0+cnVu cygpLmFwcGVuZChzdGQ6Om1ha2VfdW5pcXVlPENvbnRlbnQ6OlJ1bj4oRGlzcGxheTo6UnVuIHsg bG9naWNhbFJlY3QgfSwgaW5saW5lSXRlbSwgZmFsc2UsIGZhbHNlKSk7CiB9CiAKK3ZvaWQgTGlu ZTo6YWRqdXN0QmFzZWxpbmVBbmRMaW5lSGVpZ2h0KGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0 ZW0sIExheW91dFVuaXQgcnVuSGVpZ2h0KQoreworICAgIEFTU0VSVCghaW5saW5lSXRlbS5pc0Nv bnRhaW5lckVuZCgpICYmICFpbmxpbmVJdGVtLmlzVGV4dCgpKTsKKyAgICBhdXRvJiBsYXlvdXRC b3ggPSBpbmxpbmVJdGVtLmxheW91dEJveCgpOworICAgIGF1dG8mIHN0eWxlID0gbGF5b3V0Qm94 LnN0eWxlKCk7CisKKyAgICBpZiAoaW5saW5lSXRlbS5pc0NvbnRhaW5lclN0YXJ0KCkpIHsKKyAg ICAgICAgYXV0byYgZm9udE1ldHJpY3MgPSBzdHlsZS5mb250TWV0cmljcygpOworICAgICAgICBh dXRvIGhhbGZMZWFkaW5nID0gaGFsZkxlYWRpbmdNZXRyaWNzKGZvbnRNZXRyaWNzLCBzdHlsZS5j b21wdXRlZExpbmVIZWlnaHQoKSk7CisgICAgICAgIGlmIChoYWxmTGVhZGluZy5kZXB0aCA+IDAp CisgICAgICAgICAgICBtX2xvZ2ljYWxIZWlnaHQuZGVwdGggPSBzdGQ6Om1heChtX2xvZ2ljYWxI ZWlnaHQuZGVwdGgsIGhhbGZMZWFkaW5nLmRlcHRoKTsKKyAgICAgICAgaWYgKGhhbGZMZWFkaW5n LmhlaWdodCA+IDApCisgICAgICAgICAgICBtX2xvZ2ljYWxIZWlnaHQuaGVpZ2h0ID0gc3RkOjpt YXgobV9sb2dpY2FsSGVpZ2h0LmhlaWdodCwgaGFsZkxlYWRpbmcuaGVpZ2h0KTsKKyAgICAgICAg cmV0dXJuOworICAgIH0KKyAgICAvLyBSZXBsYWNlZCBhbmQgbm9uLXJlcGxhY2VkIGlubGluZSBs ZXZlbCBib3guCisgICAgLy8gRklYTUU6IFdlIG5lZWQgdG8gbG9vayBpbnNpZGUgdGhlIGlubGlu ZS1ibG9jaydzIGZvcm1hdHRpbmcgY29udGV4dCBhbmQgY2hlY2sgdGhlIGxpbmVib3hlcyAoaWYg YW55KSB0byBiZSBhYmxlIHRvIGJhc2VsaW5lIGFsaWduLgorICAgIGlmIChsYXlvdXRCb3guZXN0 YWJsaXNoZXNJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCgpKSB7CisgICAgICAgIGlmIChydW5IZWln aHQgPT0gbG9naWNhbEhlaWdodCgpKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAvLyBG SVhNRTogVGhpcyBmYWlscyB3aGVuIHRoZSBsaW5lIGhlaWdodCBkaWZmZXJlbmNlIGNvbWVzIGZy b20gZm9udC1zaXplIGRpZmYuCisgICAgICAgIG1fbG9naWNhbEhlaWdodC5kZXB0aCA9IHN0ZDo6 bWF4PExheW91dFVuaXQ+KDAsIG1fbG9naWNhbEhlaWdodC5kZXB0aCk7CisgICAgICAgIG1fbG9n aWNhbEhlaWdodC5oZWlnaHQgPSBzdGQ6Om1heChydW5IZWlnaHQsIG1fbG9naWNhbEhlaWdodC5o ZWlnaHQpOworICAgICAgICByZXR1cm47CisgICAgfQorICAgIC8vIDAgZGVzY2VudCAtPiBiYXNl bGluZSBhbGlnbWVudCBmb3Igbm93LgorICAgIG1fbG9naWNhbEhlaWdodC5kZXB0aCA9IHN0ZDo6 bWF4PExheW91dFVuaXQ+KDAsIG1fbG9naWNhbEhlaWdodC5kZXB0aCk7CisgICAgbV9sb2dpY2Fs SGVpZ2h0LmhlaWdodCA9IHN0ZDo6bWF4KHJ1bkhlaWdodCwgbV9sb2dpY2FsSGVpZ2h0LmhlaWdo dCk7Cit9CisKIExpbmU6OlVzZWRIZWlnaHRBbmREZXB0aCBMaW5lOjpoYWxmTGVhZGluZ01ldHJp Y3MoY29uc3QgRm9udE1ldHJpY3MmIGZvbnRNZXRyaWNzLCBMYXlvdXRVbml0IGxpbmVMb2dpY2Fs SGVpZ2h0KQogewogICAgIGF1dG8gYXNjZW50ID0gZm9udE1ldHJpY3MuYXNjZW50KCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5l LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmgK aW5kZXggNTg1NzQ5OWQ2Nzk3YzA2MjcwZmM5MTNhODNkZTY2ZTdiNGFiMzY0OC4uODJkYjg0Zjli YTlhOWQ3YTEzMTkzODVmNmU5ZDdkMDAxNDE1MGZlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaApAQCAtMTE2LDYgKzExNiw4 IEBAIHByaXZhdGU6CiAgICAgdm9pZCBhcHBlbmROb25CcmVha2FibGVTcGFjZShjb25zdCBJbmxp bmVJdGVtJiwgY29uc3QgRGlzcGxheTo6UmVjdCYgbG9naWNhbFJlY3QpOwogICAgIHZvaWQgcmVt b3ZlVHJhaWxpbmdUcmltbWFibGVDb250ZW50KCk7CiAKKyAgICB2b2lkIGFkanVzdEJhc2VsaW5l QW5kTGluZUhlaWdodChjb25zdCBJbmxpbmVJdGVtJiwgTGF5b3V0VW5pdCBydW5IZWlnaHQpOwor CiAgICAgY29uc3QgTGF5b3V0U3RhdGUmIG1fbGF5b3V0U3RhdGU7CiAgICAgc3RkOjp1bmlxdWVf cHRyPENvbnRlbnQ+IG1fY29udGVudDsKICAgICBMaXN0SGFzaFNldDxDb250ZW50OjpSdW4qPiBt X3RyaW1tYWJsZUNvbnRlbnQ7Cg==