241471 2022-06-09 09:28:38 -0700 computeUnderlineOffset should not take TextRun 2022-06-09 20:09:13 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 241442 1 zalan zalan bfulgham changseok esprehn+autocc ews-watchlist glenn koivisto kondapallykalyan mmaxfield pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1875022 0 zalan 2022-06-09 09:28:38 -0700 This is in preparation for taking visualOverflowForDecorations into use in IFC. 1875028 1 460135 zalan 2022-06-09 09:48:30 -0700 Created attachment 460135 Patch 1875070 2 460140 zalan 2022-06-09 12:27:56 -0700 Created attachment 460140 Patch 1875159 3 ews-feeder 2022-06-09 20:08:19 -0700 Committed r295444 (251450@main): <https://commits.webkit.org/251450@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 460140. 1875160 4 webkit-bug-importer 2022-06-09 20:09:13 -0700 <rdar://problem/94779432> 460135 2022-06-09 09:48:30 -0700 2022-06-09 11:09:52 -0700 Patch bug-241471-20220609094829.patch text/plain 10621 zalan RnJvbSA5Mzc2ZGQyNjhkMWRkOTgzZjZkNjVmZTExZDcyMmM5NThjYzQ3ZGRmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBU aHUsIDkgSnVuIDIwMjIgMDk6NDU6MDYgLTA3MDAKU3ViamVjdDogW1BBVENIXSBjb21wdXRlVW5k ZXJsaW5lT2Zmc2V0IHNob3VsZCBub3QgdGFrZSBUZXh0UnVuCiBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjQxNDcxCgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K ClRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIHRha2luZyB2aXN1YWwgb3ZlcmZsb3cgZm9yIGRl Y29yYXRpb24gaW50byBhY2NvdW50IGluIElGQy4KCiogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1RleHREZWNvcmF0aW9uUGFpbnRlci5jcHA6CihXZWJDb3JlOjpUZXh0RGVjb3JhdGlvblBhaW50 ZXI6OnBhaW50QmFja2dyb3VuZERlY29yYXRpb25zKToKKiBTb3VyY2UvV2ViQ29yZS9zdHlsZS9J bmxpbmVUZXh0Qm94U3R5bGUuY3BwOgooV2ViQ29yZTo6Y29tcHV0ZVVuZGVybGluZU9mZnNldCk6 IGNvbXB1dGVVbmRlcmxpbmVPZmZzZXQgd2FzIGFsd2F5cyBjYWxsZWQgd2l0aCBhIG5vbi1udWxs IHRleHRSdW4uCihXZWJDb3JlOjp2aXN1YWxPdmVyZmxvd0ZvckRlY29yYXRpb25zKToKKiBTb3Vy Y2UvV2ViQ29yZS9zdHlsZS9JbmxpbmVUZXh0Qm94U3R5bGUuaDoKLS0tCiAuLi4vcmVuZGVyaW5n L1RleHREZWNvcmF0aW9uUGFpbnRlci5jcHAgICAgICAgfCAxMiArKystCiBTb3VyY2UvV2ViQ29y ZS9zdHlsZS9JbmxpbmVUZXh0Qm94U3R5bGUuY3BwICAgfCA2MSArKysrKysrKysrKy0tLS0tLS0t CiBTb3VyY2UvV2ViQ29yZS9zdHlsZS9JbmxpbmVUZXh0Qm94U3R5bGUuaCAgICAgfCAxNCArKysr LQogMyBmaWxlcyBjaGFuZ2VkLCA1OCBpbnNlcnRpb25zKCspLCAyOSBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dERlY29yYXRpb25QYWludGVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9UZXh0RGVjb3JhdGlvblBhaW50ZXIuY3Bw CmluZGV4IGNjZWRmZmE5OTk3YS4uMDExZTQ2YzY0MTQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvVGV4dERlY29yYXRpb25QYWludGVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvVGV4dERlY29yYXRpb25QYWludGVyLmNwcApAQCAtMjgsNiArMjgsNyBA QAogI2luY2x1ZGUgIkdyYXBoaWNzQ29udGV4dC5oIgogI2luY2x1ZGUgIkhUTUxBbmNob3JFbGVt ZW50LmgiCiAjaW5jbHVkZSAiSFRNTEZvbnRFbGVtZW50LmgiCisjaW5jbHVkZSAiSW5saW5lSXRl cmF0b3JMaW5lQm94LmgiCiAjaW5jbHVkZSAiSW5saW5lVGV4dEJveFN0eWxlLmgiCiAjaW5jbHVk ZSAiUmVuZGVyQmxvY2suaCIKICNpbmNsdWRlICJSZW5kZXJTdHlsZS5oIgpAQCAtMjc5LDcgKzI4 MCwxNiBAQCB2b2lkIFRleHREZWNvcmF0aW9uUGFpbnRlcjo6cGFpbnRCYWNrZ3JvdW5kRGVjb3Jh dGlvbnMoY29uc3QgVGV4dFJ1biYgdGV4dFJ1biwgYwogICAgICAgICBpZiAobV9kZWNvcmF0aW9u cy5jb250YWlucyhUZXh0RGVjb3JhdGlvbkxpbmU6OlVuZGVybGluZSkpIHsKICAgICAgICAgICAg IGZsb2F0IHRleHREZWNvcmF0aW9uQmFzZUZvbnRTaXplID0gMTY7CiAgICAgICAgICAgICBhdXRv IGRlZmF1bHRHYXAgPSBtX2xpbmVTdHlsZS5jb21wdXRlZEZvbnRTaXplKCkgLyB0ZXh0RGVjb3Jh dGlvbkJhc2VGb250U2l6ZTsKLSAgICAgICAgICAgIGZsb2F0IG9mZnNldCA9IGNvbXB1dGVVbmRl cmxpbmVPZmZzZXQobV9saW5lU3R5bGUudGV4dFVuZGVybGluZVBvc2l0aW9uKCksIG1fbGluZVN0 eWxlLnRleHRVbmRlcmxpbmVPZmZzZXQoKSwgbV9saW5lU3R5bGUubWV0cmljc09mUHJpbWFyeUZv bnQoKSwgbV90ZXh0Qm94LCBkZWZhdWx0R2FwKTsKKyAgICAgICAgICAgIGZsb2F0IG9mZnNldCA9 IGNvbXB1dGVVbmRlcmxpbmVPZmZzZXQoeyBtX3RleHRCb3gtPnJlbmRlcmVyKCkKKyAgICAgICAg ICAgICAgICAsIG1fbGluZVN0eWxlLnRleHRVbmRlcmxpbmVQb3NpdGlvbigpCisgICAgICAgICAg ICAgICAgLCBtX2xpbmVTdHlsZS50ZXh0VW5kZXJsaW5lT2Zmc2V0KCkKKyAgICAgICAgICAgICAg ICAsIG1fbGluZVN0eWxlLm1ldHJpY3NPZlByaW1hcnlGb250KCkKKyAgICAgICAgICAgICAgICAs IG1fdGV4dEJveC0+bGluZUJveCgpLT5iYXNlbGluZVR5cGUoKQorICAgICAgICAgICAgICAgICwg bV90ZXh0Qm94LT5sb2dpY2FsVG9wKCkKKyAgICAgICAgICAgICAgICAsIG1fdGV4dEJveC0+bG9n aWNhbEJvdHRvbSgpCisgICAgICAgICAgICAgICAgLCBtX3RleHRCb3gtPmxpbmVCb3goKQorICAg ICAgICAgICAgICAgICwgZGVmYXVsdEdhcAorICAgICAgICAgICAgfSk7CiAgICAgICAgICAgICBm bG9hdCB3YXZ5T2Zmc2V0ID0gbV9zdHlsZXMudW5kZXJsaW5lU3R5bGUgPT0gVGV4dERlY29yYXRp b25TdHlsZTo6V2F2eSA/IG1fd2F2eU9mZnNldCA6IDA7CiAgICAgICAgICAgICBGbG9hdFJlY3Qg cmVjdChsb2NhbE9yaWdpbiwgRmxvYXRTaXplKG1fd2lkdGgsIHRleHREZWNvcmF0aW9uVGhpY2tu ZXNzKSk7CiAgICAgICAgICAgICByZWN0Lm1vdmUoMCwgb2Zmc2V0ICsgd2F2eU9mZnNldCk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9JbmxpbmVUZXh0Qm94U3R5bGUuY3BwIGIv U291cmNlL1dlYkNvcmUvc3R5bGUvSW5saW5lVGV4dEJveFN0eWxlLmNwcAppbmRleCA1NzVhNWMw NWIwN2EuLjkzM2MzYjRhMzNkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3R5bGUvSW5s aW5lVGV4dEJveFN0eWxlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9JbmxpbmVUZXh0 Qm94U3R5bGUuY3BwCkBAIC0xMDEsMTAgKzEwMSwxMCBAQCBzdGF0aWMgY29uc3QgUmVuZGVyRWxl bWVudCogZW5jbG9zaW5nUmVuZGVyZXJXaXRoVGV4dERlY29yYXRpb24oY29uc3QgUmVuZGVyVGV4 dAogICAgIHJldHVybiBjdXJyZW50OwogfQogICAgIAotZmxvYXQgY29tcHV0ZVVuZGVybGluZU9m ZnNldChUZXh0VW5kZXJsaW5lUG9zaXRpb24gdW5kZXJsaW5lUG9zaXRpb24sIFRleHRVbmRlcmxp bmVPZmZzZXQgdW5kZXJsaW5lT2Zmc2V0LCBjb25zdCBGb250TWV0cmljcyYgZm9udE1ldHJpY3Ms IGNvbnN0IElubGluZUl0ZXJhdG9yOjpUZXh0Qm94SXRlcmF0b3ImIHRleHRSdW4sIGZsb2F0IGRl ZmF1bHRHYXApCitmbG9hdCBjb21wdXRlVW5kZXJsaW5lT2Zmc2V0KGNvbnN0IFVuZGVybGluZU9m ZnNldEFyZ3VtZW50cyYgY29udGV4dCkKIHsKICAgICAvLyBUaGlzIHJlcHJlc2VudHMgdGhlIGdh cCBiZXR3ZWVuIHRoZSBiYXNlbGluZSBhbmQgdGhlIGNsb3Nlc3QgZWRnZSBvZiB0aGUgdW5kZXJs aW5lLgotICAgIGZsb2F0IGdhcCA9IHN0ZDo6bWF4PGludD4oMSwgc3RkOjpjZWlsKGRlZmF1bHRH YXAgLyAyLjBmKSk7CisgICAgZmxvYXQgZ2FwID0gc3RkOjptYXg8aW50PigxLCBzdGQ6OmNlaWwo Y29udGV4dC5kZWZhdWx0R2FwIC8gMi4wZikpOwogICAgIAogICAgIC8vIEZJWE1FOiBUaGUgY29k ZSBmb3IgdmlzdWFsIG92ZXJmbG93IGRldGVjdGlvbiBwYXNzZXMgaW4gYSBudWxsIGlubGluZSB0 ZXh0IGJveC4gVGhpcyBtZWFucyBpdCBpcyBub3cKICAgICAvLyBicm9rZW4gZm9yIHRoZSBjYXNl IHdoZXJlIGF1dG8gbmVlZHMgdG8gYmVoYXZlIGxpa2UgInVuZGVyIi4KQEAgLTExNiw0NCArMTE2 LDQwIEBAIGZsb2F0IGNvbXB1dGVVbmRlcmxpbmVPZmZzZXQoVGV4dFVuZGVybGluZVBvc2l0aW9u IHVuZGVybGluZVBvc2l0aW9uLCBUZXh0VW5kZXJsCiAgICAgLy8gdmVydGljYWwgdGV4dCwgc2lu Y2Ugd2UgYWxyZWFkeSBkZXRlcm1pbmVkIHRoZSBiYXNlbGluZSB0eXBlIHRvIGJlIGlkZW9ncmFw aGljIGluIHRoYXQKICAgICAvLyBjYXNlLgogICAgIAotICAgIGF1dG8gcmVzb2x2ZWRVbmRlcmxp bmVQb3NpdGlvbiA9IHVuZGVybGluZVBvc2l0aW9uOwotICAgIGlmIChyZXNvbHZlZFVuZGVybGlu ZVBvc2l0aW9uID09IFRleHRVbmRlcmxpbmVQb3NpdGlvbjo6QXV0byAmJiB1bmRlcmxpbmVPZmZz ZXQuaXNBdXRvKCkpIHsKLSAgICAgICAgaWYgKHRleHRSdW4pCi0gICAgICAgICAgICByZXNvbHZl ZFVuZGVybGluZVBvc2l0aW9uID0gdGV4dFJ1bi0+bGluZUJveCgpLT5iYXNlbGluZVR5cGUoKSA9 PSBJZGVvZ3JhcGhpY0Jhc2VsaW5lID8gVGV4dFVuZGVybGluZVBvc2l0aW9uOjpVbmRlciA6IFRl eHRVbmRlcmxpbmVQb3NpdGlvbjo6QXV0bzsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgcmVz b2x2ZWRVbmRlcmxpbmVQb3NpdGlvbiA9IFRleHRVbmRlcmxpbmVQb3NpdGlvbjo6QXV0bzsKLSAg ICB9CisgICAgYXV0byByZXNvbHZlZFVuZGVybGluZVBvc2l0aW9uID0gY29udGV4dC51bmRlcmxp bmVQb3NpdGlvbjsKKyAgICBpZiAocmVzb2x2ZWRVbmRlcmxpbmVQb3NpdGlvbiA9PSBUZXh0VW5k ZXJsaW5lUG9zaXRpb246OkF1dG8gJiYgY29udGV4dC51bmRlcmxpbmVPZmZzZXQuaXNBdXRvKCkp CisgICAgICAgIHJlc29sdmVkVW5kZXJsaW5lUG9zaXRpb24gPSBjb250ZXh0LmJhc2VsaW5lVHlw ZSA9PSBJZGVvZ3JhcGhpY0Jhc2VsaW5lID8gVGV4dFVuZGVybGluZVBvc2l0aW9uOjpVbmRlciA6 IFRleHRVbmRlcmxpbmVQb3NpdGlvbjo6QXV0bzsKICAgICAKICAgICBzd2l0Y2ggKHJlc29sdmVk VW5kZXJsaW5lUG9zaXRpb24pIHsKICAgICBjYXNlIFRleHRVbmRlcmxpbmVQb3NpdGlvbjo6QXV0 bzoKLSAgICAgICAgaWYgKHVuZGVybGluZU9mZnNldC5pc0F1dG8oKSkKLSAgICAgICAgICAgIHJl dHVybiBmb250TWV0cmljcy5hc2NlbnQoKSArIGdhcDsKLSAgICAgICAgcmV0dXJuIGZvbnRNZXRy aWNzLmFzY2VudCgpICsgdW5kZXJsaW5lT2Zmc2V0Lmxlbmd0aFZhbHVlKCk7CisgICAgICAgIGlm IChjb250ZXh0LnVuZGVybGluZU9mZnNldC5pc0F1dG8oKSkKKyAgICAgICAgICAgIHJldHVybiBj b250ZXh0LmZvbnRNZXRyaWNzLmFzY2VudCgpICsgZ2FwOworICAgICAgICByZXR1cm4gY29udGV4 dC5mb250TWV0cmljcy5hc2NlbnQoKSArIGNvbnRleHQudW5kZXJsaW5lT2Zmc2V0Lmxlbmd0aFZh bHVlKCk7CiAgICAgY2FzZSBUZXh0VW5kZXJsaW5lUG9zaXRpb246OkZyb21Gb250OgotICAgICAg ICByZXR1cm4gZm9udE1ldHJpY3MuYXNjZW50KCkgKyBmb250TWV0cmljcy51bmRlcmxpbmVQb3Np dGlvbigpICsgdW5kZXJsaW5lT2Zmc2V0Lmxlbmd0aE9yKDApOworICAgICAgICByZXR1cm4gY29u dGV4dC5mb250TWV0cmljcy5hc2NlbnQoKSArIGNvbnRleHQuZm9udE1ldHJpY3MudW5kZXJsaW5l UG9zaXRpb24oKSArIGNvbnRleHQudW5kZXJsaW5lT2Zmc2V0Lmxlbmd0aE9yKDApOwogICAgIGNh c2UgVGV4dFVuZGVybGluZVBvc2l0aW9uOjpVbmRlcjogewotICAgICAgICBBU1NFUlQodGV4dFJ1 bik7CisgICAgICAgIEFTU0VSVChjb250ZXh0LmxpbmVCb3gpOwogICAgICAgICAvLyBQb3NpdGlv biB1bmRlcmxpbmUgcmVsYXRpdmUgdG8gdGhlIGJvdHRvbSBlZGdlIG9mIHRoZSBsb3dlc3QgZWxl bWVudCdzIGNvbnRlbnQgYm94LgotICAgICAgICBhdXRvIGxpbmVCb3ggPSB0ZXh0UnVuLT5saW5l Qm94KCk7Ci0gICAgICAgIGF1dG8qIGRlY29yYXRpb25SZW5kZXJlciA9IGVuY2xvc2luZ1JlbmRl cmVyV2l0aFRleHREZWNvcmF0aW9uKHRleHRSdW4tPnJlbmRlcmVyKCksIFRleHREZWNvcmF0aW9u TGluZTo6VW5kZXJsaW5lLCBsaW5lQm94LT5pc0ZpcnN0KCkpOworICAgICAgICBhdXRvKiBkZWNv cmF0aW9uUmVuZGVyZXIgPSBlbmNsb3NpbmdSZW5kZXJlcldpdGhUZXh0RGVjb3JhdGlvbihjb250 ZXh0LnJlbmRlcmVyLCBUZXh0RGVjb3JhdGlvbkxpbmU6OlVuZGVybGluZSwgY29udGV4dC5saW5l Qm94LT5pc0ZpcnN0KCkpOwogICAgICAgICAKICAgICAgICAgZmxvYXQgb2Zmc2V0OwotICAgICAg ICBpZiAodGV4dFJ1bi0+cmVuZGVyZXIoKS5zdHlsZSgpLmlzRmxpcHBlZExpbmVzV3JpdGluZ01v ZGUoKSkgewotICAgICAgICAgICAgb2Zmc2V0ID0gdGV4dFJ1bi0+bG9naWNhbFRvcCgpOwotICAg ICAgICAgICAgbWluTG9naWNhbFRvcEZvclRleHREZWNvcmF0aW9uTGluZShsaW5lQm94LCBvZmZz ZXQsIGRlY29yYXRpb25SZW5kZXJlciwgVGV4dERlY29yYXRpb25MaW5lOjpVbmRlcmxpbmUpOwot ICAgICAgICAgICAgb2Zmc2V0ID0gdGV4dFJ1bi0+bG9naWNhbFRvcCgpIC0gb2Zmc2V0OworICAg ICAgICBpZiAoY29udGV4dC5yZW5kZXJlci5zdHlsZSgpLmlzRmxpcHBlZExpbmVzV3JpdGluZ01v ZGUoKSkgeworICAgICAgICAgICAgb2Zmc2V0ID0gY29udGV4dC50ZXh0UnVuTG9naWNhbFRvcDsK KyAgICAgICAgICAgIG1pbkxvZ2ljYWxUb3BGb3JUZXh0RGVjb3JhdGlvbkxpbmUoY29udGV4dC5s aW5lQm94LCBvZmZzZXQsIGRlY29yYXRpb25SZW5kZXJlciwgVGV4dERlY29yYXRpb25MaW5lOjpV bmRlcmxpbmUpOworICAgICAgICAgICAgb2Zmc2V0ID0gY29udGV4dC50ZXh0UnVuTG9naWNhbFRv cCAtIG9mZnNldDsKICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgIG9mZnNldCA9IHRleHRS dW4tPmxvZ2ljYWxCb3R0b20oKTsKLSAgICAgICAgICAgIG1heExvZ2ljYWxCb3R0b21Gb3JUZXh0 RGVjb3JhdGlvbkxpbmUobGluZUJveCwgb2Zmc2V0LCBkZWNvcmF0aW9uUmVuZGVyZXIsIFRleHRE ZWNvcmF0aW9uTGluZTo6VW5kZXJsaW5lKTsKLSAgICAgICAgICAgIG9mZnNldCAtPSB0ZXh0UnVu LT5sb2dpY2FsQm90dG9tKCk7CisgICAgICAgICAgICBvZmZzZXQgPSBjb250ZXh0LnRleHRSdW5M b2dpY2FsQm90dG9tOworICAgICAgICAgICAgbWF4TG9naWNhbEJvdHRvbUZvclRleHREZWNvcmF0 aW9uTGluZShjb250ZXh0LmxpbmVCb3gsIG9mZnNldCwgZGVjb3JhdGlvblJlbmRlcmVyLCBUZXh0 RGVjb3JhdGlvbkxpbmU6OlVuZGVybGluZSk7CisgICAgICAgICAgICBvZmZzZXQgLT0gY29udGV4 dC50ZXh0UnVuTG9naWNhbEJvdHRvbTsKICAgICAgICAgfQotICAgICAgICBhdXRvIGRlc2lyZWRP ZmZzZXQgPSB0ZXh0UnVuLT5sb2dpY2FsSGVpZ2h0KCkgKyBnYXAgKyBzdGQ6Om1heChvZmZzZXQs IDAuMGYpICsgdW5kZXJsaW5lT2Zmc2V0Lmxlbmd0aE9yKDApOwotICAgICAgICByZXR1cm4gc3Rk OjptYXg8ZmxvYXQ+KGRlc2lyZWRPZmZzZXQsIGZvbnRNZXRyaWNzLmFzY2VudCgpKTsKKyAgICAg ICAgYXV0byB0ZXh0UnVuTG9naWNhbEhlaWdodCA9IGNvbnRleHQudGV4dFJ1bkxvZ2ljYWxCb3R0 b20gLSBjb250ZXh0LnRleHRSdW5Mb2dpY2FsVG9wOworICAgICAgICBhdXRvIGRlc2lyZWRPZmZz ZXQgPSB0ZXh0UnVuTG9naWNhbEhlaWdodCArIGdhcCArIHN0ZDo6bWF4KG9mZnNldCwgMC4wZikg KyBjb250ZXh0LnVuZGVybGluZU9mZnNldC5sZW5ndGhPcigwKTsKKyAgICAgICAgcmV0dXJuIHN0 ZDo6bWF4PGZsb2F0PihkZXNpcmVkT2Zmc2V0LCBjb250ZXh0LmZvbnRNZXRyaWNzLmFzY2VudCgp KTsKICAgICB9CiAgICAgfQogCiAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgcmV0dXJu IGZvbnRNZXRyaWNzLmFzY2VudCgpICsgZ2FwOworICAgIHJldHVybiBjb250ZXh0LmZvbnRNZXRy aWNzLmFzY2VudCgpICsgZ2FwOwogfQogICAgIAogV2F2eVN0cm9rZVBhcmFtZXRlcnMgZ2V0V2F2 eVN0cm9rZVBhcmFtZXRlcnMoZmxvYXQgZm9udFNpemUpCkBAIC0xOTEsMTEgKzE4NywyMiBAQCBH bHlwaE92ZXJmbG93IHZpc3VhbE92ZXJmbG93Rm9yRGVjb3JhdGlvbnMoY29uc3QgUmVuZGVyU3R5 bGUmIGxpbmVTdHlsZSwgY29uc3QgSQogICAgIC8vIFRoZXNlIG1ldHJpY3MgbXVzdCBtYXRjaCB3 aGVyZSB1bmRlcmxpbmVzIGdldCBkcmF3bi4KICAgICAvLyBGSVhNRTogU2hhcmUgdGhlIGNvZGUg aW4gVGV4dERlY29yYXRpb25QYWludGVyOjpwYWludEJhY2tncm91bmREZWNvcmF0aW9ucygpIHNv IHdlIGNhbiBqdXN0IHF1ZXJ5IGl0IGZvciB0aGUgcGFpbnRlZCBnZW9tZXRyeS4KICAgICBpZiAo ZGVjb3JhdGlvbiAmIFRleHREZWNvcmF0aW9uTGluZTo6VW5kZXJsaW5lKSB7CisgICAgICAgIC8v IEZJWE1FOiBSZW5kZXJTdHlsZSBjYWxscyB1cyB3aXRoIGVtcHR5IHRleHRSdW4gYnV0IG9ubHkg d2hlbiBkZWNvcmF0aW9uIGlzIG5vdCBVbmRlcmxpbmUuIAorICAgICAgICBBU1NFUlQodGV4dFJ1 bik7CiAgICAgICAgIC8vIENvbXBlbnNhdGUgZm9yIHRoZSBpbnRlZ3JhbCBjZWlsaW5nIGluIEdy YXBoaWNzQ29udGV4dDo6Y29tcHV0ZUxpbmVCb3VuZHNBbmRBbnRpYWxpYXNpbmdNb2RlRm9yVGV4 dCgpCiAgICAgICAgIGludCB1bmRlcmxpbmVPZmZzZXQgPSAxOwogICAgICAgICBmbG9hdCB0ZXh0 RGVjb3JhdGlvbkJhc2VGb250U2l6ZSA9IDE2OwogICAgICAgICBhdXRvIGRlZmF1bHRHYXAgPSBs aW5lU3R5bGUuY29tcHV0ZWRGb250U2l6ZSgpIC8gdGV4dERlY29yYXRpb25CYXNlRm9udFNpemU7 Ci0gICAgICAgIHVuZGVybGluZU9mZnNldCArPSBjb21wdXRlVW5kZXJsaW5lT2Zmc2V0KGxpbmVT dHlsZS50ZXh0VW5kZXJsaW5lUG9zaXRpb24oKSwgbGluZVN0eWxlLnRleHRVbmRlcmxpbmVPZmZz ZXQoKSwgbGluZVN0eWxlLm1ldHJpY3NPZlByaW1hcnlGb250KCksIHRleHRSdW4sIGRlZmF1bHRH YXApOworICAgICAgICB1bmRlcmxpbmVPZmZzZXQgKz0gY29tcHV0ZVVuZGVybGluZU9mZnNldCh7 IHRleHRSdW4tPnJlbmRlcmVyKCkKKyAgICAgICAgICAgICwgbGluZVN0eWxlLnRleHRVbmRlcmxp bmVQb3NpdGlvbigpCisgICAgICAgICAgICAsIGxpbmVTdHlsZS50ZXh0VW5kZXJsaW5lT2Zmc2V0 KCkKKyAgICAgICAgICAgICwgbGluZVN0eWxlLm1ldHJpY3NPZlByaW1hcnlGb250KCkKKyAgICAg ICAgICAgICwgdGV4dFJ1bi0+bGluZUJveCgpLT5iYXNlbGluZVR5cGUoKQorICAgICAgICAgICAg LCB0ZXh0UnVuLT5sb2dpY2FsVG9wKCkKKyAgICAgICAgICAgICwgdGV4dFJ1bi0+bG9naWNhbEJv dHRvbSgpCisgICAgICAgICAgICAsIHRleHRSdW4tPmxpbmVCb3goKQorICAgICAgICAgICAgLCBk ZWZhdWx0R2FwCisgICAgICAgIH0pOwogICAgICAgICBpZiAoZGVjb3JhdGlvblN0eWxlID09IFRl eHREZWNvcmF0aW9uU3R5bGU6OldhdnkpIHsKICAgICAgICAgICAgIG92ZXJmbG93UmVzdWx0LmV4 dGVuZEJvdHRvbSh1bmRlcmxpbmVPZmZzZXQgKyB3YXZ5T2Zmc2V0ICsgd2F2eVN0cm9rZVBhcmFt ZXRlcnMuY29udHJvbFBvaW50RGlzdGFuY2UgKyBzdHJva2VUaGlja25lc3MgLSBoZWlnaHQpOwog ICAgICAgICAgICAgb3ZlcmZsb3dSZXN1bHQuZXh0ZW5kVG9wKC0odW5kZXJsaW5lT2Zmc2V0ICsg d2F2eU9mZnNldCAtIHdhdnlTdHJva2VQYXJhbWV0ZXJzLmNvbnRyb2xQb2ludERpc3RhbmNlIC0g c3Ryb2tlVGhpY2tuZXNzKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9Jbmxp bmVUZXh0Qm94U3R5bGUuaCBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL0lubGluZVRleHRCb3hTdHls ZS5oCmluZGV4IGM4NzgyMzM4Zjc0Yi4uMWI4ZDVlMDUyNGY1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9zdHlsZS9JbmxpbmVUZXh0Qm94U3R5bGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9z dHlsZS9JbmxpbmVUZXh0Qm94U3R5bGUuaApAQCAtNTMsNiArNTMsMTggQEAgc3RydWN0IFdhdnlT dHJva2VQYXJhbWV0ZXJzIHsKIH07CiBXYXZ5U3Ryb2tlUGFyYW1ldGVycyBnZXRXYXZ5U3Ryb2tl UGFyYW1ldGVycyhmbG9hdCBmb250U2l6ZSk7CiBHbHlwaE92ZXJmbG93IHZpc3VhbE92ZXJmbG93 Rm9yRGVjb3JhdGlvbnMoY29uc3QgUmVuZGVyU3R5bGUmIGxpbmVTdHlsZSwgY29uc3QgSW5saW5l SXRlcmF0b3I6OlRleHRCb3hJdGVyYXRvciYpOwotZmxvYXQgY29tcHV0ZVVuZGVybGluZU9mZnNl dChUZXh0VW5kZXJsaW5lUG9zaXRpb24sIFRleHRVbmRlcmxpbmVPZmZzZXQsIGNvbnN0IEZvbnRN ZXRyaWNzJiwgY29uc3QgSW5saW5lSXRlcmF0b3I6OlRleHRCb3hJdGVyYXRvciYsIGZsb2F0IHRl eHREZWNvcmF0aW9uVGhpY2tuZXNzKTsKKworc3RydWN0IFVuZGVybGluZU9mZnNldEFyZ3VtZW50 cyB7CisgICAgY29uc3QgUmVuZGVyVGV4dCYgcmVuZGVyZXI7CisgICAgVGV4dFVuZGVybGluZVBv c2l0aW9uIHVuZGVybGluZVBvc2l0aW9uIHsgVGV4dFVuZGVybGluZVBvc2l0aW9uOjpBdXRvIH07 CisgICAgVGV4dFVuZGVybGluZU9mZnNldCB1bmRlcmxpbmVPZmZzZXQ7CisgICAgY29uc3QgRm9u dE1ldHJpY3MmIGZvbnRNZXRyaWNzOworICAgIEZvbnRCYXNlbGluZSBiYXNlbGluZVR5cGUgeyBB bHBoYWJldGljQmFzZWxpbmUgfTsKKyAgICBmbG9hdCB0ZXh0UnVuTG9naWNhbFRvcCB7IDAgfTsK KyAgICBmbG9hdCB0ZXh0UnVuTG9naWNhbEJvdHRvbSB7IDAgfTsKKyAgICBjb25zdCBJbmxpbmVJ dGVyYXRvcjo6TGluZUJveEl0ZXJhdG9yJiBsaW5lQm94OworICAgIGZsb2F0IGRlZmF1bHRHYXAg eyAwIH07Cit9OworZmxvYXQgY29tcHV0ZVVuZGVybGluZU9mZnNldChjb25zdCBVbmRlcmxpbmVP ZmZzZXRBcmd1bWVudHMmKTsKICAgICAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKLS0gCjIuMzIu MCAoQXBwbGUgR2l0LTEzMikKCg== 460140 2022-06-09 12:27:56 -0700 2022-06-09 20:08:20 -0700 Patch bug-241471-20220609122755.patch text/plain 9962 zalan RnJvbSBiNzNmMzk5ZThkYTBlZWZkMjJjNDZmYmEzZjY5ODhlMjFmNTM2ZTBhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBU aHUsIDkgSnVuIDIwMjIgMTI6MjU6NTggLTA3MDAKU3ViamVjdDogW1BBVENIXSBjb21wdXRlVW5k ZXJsaW5lT2Zmc2V0IHNob3VsZCBub3QgdGFrZSBUZXh0UnVuCiBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjQxNDcxCgpSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4K ClRoaXMgaXMgaW4gcHJlcGFyYXRpb24gZm9yIHRha2luZyB2aXN1YWwgb3ZlcmZsb3cgZm9yIGRl Y29yYXRpb24gaW50byBhY2NvdW50IGluIElGQy4KCiogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1RleHREZWNvcmF0aW9uUGFpbnRlci5jcHA6CihXZWJDb3JlOjpUZXh0RGVjb3JhdGlvblBhaW50 ZXI6OnBhaW50QmFja2dyb3VuZERlY29yYXRpb25zKToKKiBTb3VyY2UvV2ViQ29yZS9zdHlsZS9J bmxpbmVUZXh0Qm94U3R5bGUuY3BwOgooV2ViQ29yZTo6Y29tcHV0ZVVuZGVybGluZU9mZnNldCk6 CihXZWJDb3JlOjp2aXN1YWxPdmVyZmxvd0ZvckRlY29yYXRpb25zKToKKiBTb3VyY2UvV2ViQ29y ZS9zdHlsZS9JbmxpbmVUZXh0Qm94U3R5bGUuaDoKLS0tCiAuLi4vcmVuZGVyaW5nL1RleHREZWNv cmF0aW9uUGFpbnRlci5jcHAgICAgICAgfCAxMCArKystCiBTb3VyY2UvV2ViQ29yZS9zdHlsZS9J bmxpbmVUZXh0Qm94U3R5bGUuY3BwICAgfCA1MiArKysrKysrKysrKystLS0tLS0tCiBTb3VyY2Uv V2ViQ29yZS9zdHlsZS9JbmxpbmVUZXh0Qm94U3R5bGUuaCAgICAgfCAxMyArKysrLQogMyBmaWxl cyBjaGFuZ2VkLCA1NSBpbnNlcnRpb25zKCspLCAyMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dERlY29yYXRpb25QYWludGVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9UZXh0RGVjb3JhdGlvblBhaW50ZXIuY3BwCmluZGV4IGNj ZWRmZmE5OTk3YS4uZDZhYzQxNDhhZjU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvVGV4dERlY29yYXRpb25QYWludGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvVGV4dERlY29yYXRpb25QYWludGVyLmNwcApAQCAtMjgsNiArMjgsNyBAQAogI2luY2x1 ZGUgIkdyYXBoaWNzQ29udGV4dC5oIgogI2luY2x1ZGUgIkhUTUxBbmNob3JFbGVtZW50LmgiCiAj aW5jbHVkZSAiSFRNTEZvbnRFbGVtZW50LmgiCisjaW5jbHVkZSAiSW5saW5lSXRlcmF0b3JMaW5l Qm94LmgiCiAjaW5jbHVkZSAiSW5saW5lVGV4dEJveFN0eWxlLmgiCiAjaW5jbHVkZSAiUmVuZGVy QmxvY2suaCIKICNpbmNsdWRlICJSZW5kZXJTdHlsZS5oIgpAQCAtMjc5LDcgKzI4MCwxNCBAQCB2 b2lkIFRleHREZWNvcmF0aW9uUGFpbnRlcjo6cGFpbnRCYWNrZ3JvdW5kRGVjb3JhdGlvbnMoY29u c3QgVGV4dFJ1biYgdGV4dFJ1biwgYwogICAgICAgICBpZiAobV9kZWNvcmF0aW9ucy5jb250YWlu cyhUZXh0RGVjb3JhdGlvbkxpbmU6OlVuZGVybGluZSkpIHsKICAgICAgICAgICAgIGZsb2F0IHRl eHREZWNvcmF0aW9uQmFzZUZvbnRTaXplID0gMTY7CiAgICAgICAgICAgICBhdXRvIGRlZmF1bHRH YXAgPSBtX2xpbmVTdHlsZS5jb21wdXRlZEZvbnRTaXplKCkgLyB0ZXh0RGVjb3JhdGlvbkJhc2VG b250U2l6ZTsKLSAgICAgICAgICAgIGZsb2F0IG9mZnNldCA9IGNvbXB1dGVVbmRlcmxpbmVPZmZz ZXQobV9saW5lU3R5bGUudGV4dFVuZGVybGluZVBvc2l0aW9uKCksIG1fbGluZVN0eWxlLnRleHRV bmRlcmxpbmVPZmZzZXQoKSwgbV9saW5lU3R5bGUubWV0cmljc09mUHJpbWFyeUZvbnQoKSwgbV90 ZXh0Qm94LCBkZWZhdWx0R2FwKTsKKyAgICAgICAgICAgIGZsb2F0IG9mZnNldCA9IGNvbXB1dGVV bmRlcmxpbmVPZmZzZXQoeyBtX2xpbmVTdHlsZQorICAgICAgICAgICAgICAgICwgZGVmYXVsdEdh cAorICAgICAgICAgICAgICAgICwgJm1fdGV4dEJveC0+cmVuZGVyZXIoKQorICAgICAgICAgICAg ICAgICwgbV90ZXh0Qm94LT5saW5lQm94KCktPmJhc2VsaW5lVHlwZSgpCisgICAgICAgICAgICAg ICAgLCBtX3RleHRCb3gtPmxvZ2ljYWxUb3AoKQorICAgICAgICAgICAgICAgICwgbV90ZXh0Qm94 LT5sb2dpY2FsQm90dG9tKCkKKyAgICAgICAgICAgICAgICAsIG1fdGV4dEJveC0+bGluZUJveCgp CisgICAgICAgICAgICB9KTsKICAgICAgICAgICAgIGZsb2F0IHdhdnlPZmZzZXQgPSBtX3N0eWxl cy51bmRlcmxpbmVTdHlsZSA9PSBUZXh0RGVjb3JhdGlvblN0eWxlOjpXYXZ5ID8gbV93YXZ5T2Zm c2V0IDogMDsKICAgICAgICAgICAgIEZsb2F0UmVjdCByZWN0KGxvY2FsT3JpZ2luLCBGbG9hdFNp emUobV93aWR0aCwgdGV4dERlY29yYXRpb25UaGlja25lc3MpKTsKICAgICAgICAgICAgIHJlY3Qu bW92ZSgwLCBvZmZzZXQgKyB3YXZ5T2Zmc2V0KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3N0eWxlL0lubGluZVRleHRCb3hTdHlsZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9Jbmxp bmVUZXh0Qm94U3R5bGUuY3BwCmluZGV4IDU3NWE1YzA1YjA3YS4uMTVmZWJlZWMzNDUxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdHlsZS9JbmxpbmVUZXh0Qm94U3R5bGUuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3N0eWxlL0lubGluZVRleHRCb3hTdHlsZS5jcHAKQEAgLTI5LDcgKzI5 LDYgQEAKICNpbmNsdWRlICJGb250Q2FzY2FkZS5oIgogI2luY2x1ZGUgIkhUTUxBbmNob3JFbGVt ZW50LmgiCiAjaW5jbHVkZSAiSFRNTE5hbWVzLmgiCi0jaW5jbHVkZSAiSW5saW5lSXRlcmF0b3JM aW5lQm94LmgiCiAjaW5jbHVkZSAiSW5saW5lSXRlcmF0b3JUZXh0Qm94LmgiCiAjaW5jbHVkZSAi TGVnYWN5SW5saW5lVGV4dEJveC5oIgogI2luY2x1ZGUgIkxlZ2FjeVJvb3RJbmxpbmVCb3guaCIK QEAgLTEwMSwxMCArMTAwLDEwIEBAIHN0YXRpYyBjb25zdCBSZW5kZXJFbGVtZW50KiBlbmNsb3Np bmdSZW5kZXJlcldpdGhUZXh0RGVjb3JhdGlvbihjb25zdCBSZW5kZXJUZXh0CiAgICAgcmV0dXJu IGN1cnJlbnQ7CiB9CiAgICAgCi1mbG9hdCBjb21wdXRlVW5kZXJsaW5lT2Zmc2V0KFRleHRVbmRl cmxpbmVQb3NpdGlvbiB1bmRlcmxpbmVQb3NpdGlvbiwgVGV4dFVuZGVybGluZU9mZnNldCB1bmRl cmxpbmVPZmZzZXQsIGNvbnN0IEZvbnRNZXRyaWNzJiBmb250TWV0cmljcywgY29uc3QgSW5saW5l SXRlcmF0b3I6OlRleHRCb3hJdGVyYXRvciYgdGV4dFJ1biwgZmxvYXQgZGVmYXVsdEdhcCkKK2Zs b2F0IGNvbXB1dGVVbmRlcmxpbmVPZmZzZXQoY29uc3QgVW5kZXJsaW5lT2Zmc2V0QXJndW1lbnRz JiBjb250ZXh0KQogewogICAgIC8vIFRoaXMgcmVwcmVzZW50cyB0aGUgZ2FwIGJldHdlZW4gdGhl IGJhc2VsaW5lIGFuZCB0aGUgY2xvc2VzdCBlZGdlIG9mIHRoZSB1bmRlcmxpbmUuCi0gICAgZmxv YXQgZ2FwID0gc3RkOjptYXg8aW50PigxLCBzdGQ6OmNlaWwoZGVmYXVsdEdhcCAvIDIuMGYpKTsK KyAgICBmbG9hdCBnYXAgPSBzdGQ6Om1heDxpbnQ+KDEsIHN0ZDo6Y2VpbChjb250ZXh0LmRlZmF1 bHRHYXAgLyAyLjBmKSk7CiAgICAgCiAgICAgLy8gRklYTUU6IFRoZSBjb2RlIGZvciB2aXN1YWwg b3ZlcmZsb3cgZGV0ZWN0aW9uIHBhc3NlcyBpbiBhIG51bGwgaW5saW5lIHRleHQgYm94LiBUaGlz IG1lYW5zIGl0IGlzIG5vdwogICAgIC8vIGJyb2tlbiBmb3IgdGhlIGNhc2Ugd2hlcmUgYXV0byBu ZWVkcyB0byBiZWhhdmUgbGlrZSAidW5kZXIiLgpAQCAtMTE1LDExICsxMTQsMTQgQEAgZmxvYXQg Y29tcHV0ZVVuZGVybGluZU9mZnNldChUZXh0VW5kZXJsaW5lUG9zaXRpb24gdW5kZXJsaW5lUG9z aXRpb24sIFRleHRVbmRlcmwKICAgICAvLyBldmVuIGlmIGl0IGlzIGhvcml6b250YWwsIGJ1dCBk ZXRlY3RpbmcgdGhpcyBoYXMgcGVyZm9ybWFuY2UgaW1wbGljYXRpb25zLiBGb3Igbm93IHdlIG9u bHkgd29yayB3aXRoCiAgICAgLy8gdmVydGljYWwgdGV4dCwgc2luY2Ugd2UgYWxyZWFkeSBkZXRl cm1pbmVkIHRoZSBiYXNlbGluZSB0eXBlIHRvIGJlIGlkZW9ncmFwaGljIGluIHRoYXQKICAgICAv LyBjYXNlLgotICAgIAorICAgIGF1dG8gdW5kZXJsaW5lUG9zaXRpb24gPSBjb250ZXh0LmxpbmVT dHlsZS50ZXh0VW5kZXJsaW5lUG9zaXRpb24oKTsKKyAgICBhdXRvIHVuZGVybGluZU9mZnNldCA9 IGNvbnRleHQubGluZVN0eWxlLnRleHRVbmRlcmxpbmVPZmZzZXQoKTsKKyAgICBhdXRvJiBmb250 TWV0cmljcyA9IGNvbnRleHQubGluZVN0eWxlLm1ldHJpY3NPZlByaW1hcnlGb250KCk7CisKICAg ICBhdXRvIHJlc29sdmVkVW5kZXJsaW5lUG9zaXRpb24gPSB1bmRlcmxpbmVQb3NpdGlvbjsKICAg ICBpZiAocmVzb2x2ZWRVbmRlcmxpbmVQb3NpdGlvbiA9PSBUZXh0VW5kZXJsaW5lUG9zaXRpb246 OkF1dG8gJiYgdW5kZXJsaW5lT2Zmc2V0LmlzQXV0bygpKSB7Ci0gICAgICAgIGlmICh0ZXh0UnVu KQotICAgICAgICAgICAgcmVzb2x2ZWRVbmRlcmxpbmVQb3NpdGlvbiA9IHRleHRSdW4tPmxpbmVC b3goKS0+YmFzZWxpbmVUeXBlKCkgPT0gSWRlb2dyYXBoaWNCYXNlbGluZSA/IFRleHRVbmRlcmxp bmVQb3NpdGlvbjo6VW5kZXIgOiBUZXh0VW5kZXJsaW5lUG9zaXRpb246OkF1dG87CisgICAgICAg IGlmIChjb250ZXh0LnJlbmRlcmVyKQorICAgICAgICAgICAgcmVzb2x2ZWRVbmRlcmxpbmVQb3Np dGlvbiA9IGNvbnRleHQuYmFzZWxpbmVUeXBlID09IElkZW9ncmFwaGljQmFzZWxpbmUgPyBUZXh0 VW5kZXJsaW5lUG9zaXRpb246OlVuZGVyIDogVGV4dFVuZGVybGluZVBvc2l0aW9uOjpBdXRvOwog ICAgICAgICBlbHNlCiAgICAgICAgICAgICByZXNvbHZlZFVuZGVybGluZVBvc2l0aW9uID0gVGV4 dFVuZGVybGluZVBvc2l0aW9uOjpBdXRvOwogICAgIH0KQEAgLTEzMiwyMiArMTM0LDIyIEBAIGZs b2F0IGNvbXB1dGVVbmRlcmxpbmVPZmZzZXQoVGV4dFVuZGVybGluZVBvc2l0aW9uIHVuZGVybGlu ZVBvc2l0aW9uLCBUZXh0VW5kZXJsCiAgICAgY2FzZSBUZXh0VW5kZXJsaW5lUG9zaXRpb246OkZy b21Gb250OgogICAgICAgICByZXR1cm4gZm9udE1ldHJpY3MuYXNjZW50KCkgKyBmb250TWV0cmlj cy51bmRlcmxpbmVQb3NpdGlvbigpICsgdW5kZXJsaW5lT2Zmc2V0Lmxlbmd0aE9yKDApOwogICAg IGNhc2UgVGV4dFVuZGVybGluZVBvc2l0aW9uOjpVbmRlcjogewotICAgICAgICBBU1NFUlQodGV4 dFJ1bik7CisgICAgICAgIEFTU0VSVChjb250ZXh0LmxpbmVCb3ggJiYgY29udGV4dC5yZW5kZXJl cik7CiAgICAgICAgIC8vIFBvc2l0aW9uIHVuZGVybGluZSByZWxhdGl2ZSB0byB0aGUgYm90dG9t IGVkZ2Ugb2YgdGhlIGxvd2VzdCBlbGVtZW50J3MgY29udGVudCBib3guCi0gICAgICAgIGF1dG8g bGluZUJveCA9IHRleHRSdW4tPmxpbmVCb3goKTsKLSAgICAgICAgYXV0byogZGVjb3JhdGlvblJl bmRlcmVyID0gZW5jbG9zaW5nUmVuZGVyZXJXaXRoVGV4dERlY29yYXRpb24odGV4dFJ1bi0+cmVu ZGVyZXIoKSwgVGV4dERlY29yYXRpb25MaW5lOjpVbmRlcmxpbmUsIGxpbmVCb3gtPmlzRmlyc3Qo KSk7CisgICAgICAgIGF1dG8qIGRlY29yYXRpb25SZW5kZXJlciA9IGVuY2xvc2luZ1JlbmRlcmVy V2l0aFRleHREZWNvcmF0aW9uKCpjb250ZXh0LnJlbmRlcmVyLCBUZXh0RGVjb3JhdGlvbkxpbmU6 OlVuZGVybGluZSwgY29udGV4dC5saW5lQm94LT5pc0ZpcnN0KCkpOwogICAgICAgICAKICAgICAg ICAgZmxvYXQgb2Zmc2V0OwotICAgICAgICBpZiAodGV4dFJ1bi0+cmVuZGVyZXIoKS5zdHlsZSgp LmlzRmxpcHBlZExpbmVzV3JpdGluZ01vZGUoKSkgewotICAgICAgICAgICAgb2Zmc2V0ID0gdGV4 dFJ1bi0+bG9naWNhbFRvcCgpOwotICAgICAgICAgICAgbWluTG9naWNhbFRvcEZvclRleHREZWNv cmF0aW9uTGluZShsaW5lQm94LCBvZmZzZXQsIGRlY29yYXRpb25SZW5kZXJlciwgVGV4dERlY29y YXRpb25MaW5lOjpVbmRlcmxpbmUpOwotICAgICAgICAgICAgb2Zmc2V0ID0gdGV4dFJ1bi0+bG9n aWNhbFRvcCgpIC0gb2Zmc2V0OworICAgICAgICBpZiAoY29udGV4dC5yZW5kZXJlci0+c3R5bGUo KS5pc0ZsaXBwZWRMaW5lc1dyaXRpbmdNb2RlKCkpIHsKKyAgICAgICAgICAgIG9mZnNldCA9IGNv bnRleHQudGV4dFJ1bkxvZ2ljYWxUb3A7CisgICAgICAgICAgICBtaW5Mb2dpY2FsVG9wRm9yVGV4 dERlY29yYXRpb25MaW5lKGNvbnRleHQubGluZUJveCwgb2Zmc2V0LCBkZWNvcmF0aW9uUmVuZGVy ZXIsIFRleHREZWNvcmF0aW9uTGluZTo6VW5kZXJsaW5lKTsKKyAgICAgICAgICAgIG9mZnNldCA9 IGNvbnRleHQudGV4dFJ1bkxvZ2ljYWxUb3AgLSBvZmZzZXQ7CiAgICAgICAgIH0gZWxzZSB7Ci0g ICAgICAgICAgICBvZmZzZXQgPSB0ZXh0UnVuLT5sb2dpY2FsQm90dG9tKCk7Ci0gICAgICAgICAg ICBtYXhMb2dpY2FsQm90dG9tRm9yVGV4dERlY29yYXRpb25MaW5lKGxpbmVCb3gsIG9mZnNldCwg ZGVjb3JhdGlvblJlbmRlcmVyLCBUZXh0RGVjb3JhdGlvbkxpbmU6OlVuZGVybGluZSk7Ci0gICAg ICAgICAgICBvZmZzZXQgLT0gdGV4dFJ1bi0+bG9naWNhbEJvdHRvbSgpOworICAgICAgICAgICAg b2Zmc2V0ID0gY29udGV4dC50ZXh0UnVuTG9naWNhbEJvdHRvbTsKKyAgICAgICAgICAgIG1heExv Z2ljYWxCb3R0b21Gb3JUZXh0RGVjb3JhdGlvbkxpbmUoY29udGV4dC5saW5lQm94LCBvZmZzZXQs IGRlY29yYXRpb25SZW5kZXJlciwgVGV4dERlY29yYXRpb25MaW5lOjpVbmRlcmxpbmUpOworICAg ICAgICAgICAgb2Zmc2V0IC09IGNvbnRleHQudGV4dFJ1bkxvZ2ljYWxCb3R0b207CiAgICAgICAg IH0KLSAgICAgICAgYXV0byBkZXNpcmVkT2Zmc2V0ID0gdGV4dFJ1bi0+bG9naWNhbEhlaWdodCgp ICsgZ2FwICsgc3RkOjptYXgob2Zmc2V0LCAwLjBmKSArIHVuZGVybGluZU9mZnNldC5sZW5ndGhP cigwKTsKKyAgICAgICAgYXV0byB0ZXh0UnVuTG9naWNhbEhlaWdodCA9IGNvbnRleHQudGV4dFJ1 bkxvZ2ljYWxCb3R0b20gLSBjb250ZXh0LnRleHRSdW5Mb2dpY2FsVG9wOworICAgICAgICBhdXRv IGRlc2lyZWRPZmZzZXQgPSB0ZXh0UnVuTG9naWNhbEhlaWdodCArIGdhcCArIHN0ZDo6bWF4KG9m ZnNldCwgMC4wZikgKyB1bmRlcmxpbmVPZmZzZXQubGVuZ3RoT3IoMCk7CiAgICAgICAgIHJldHVy biBzdGQ6Om1heDxmbG9hdD4oZGVzaXJlZE9mZnNldCwgZm9udE1ldHJpY3MuYXNjZW50KCkpOwog ICAgIH0KICAgICB9CkBAIC0xOTUsNyArMTk3LDIxIEBAIEdseXBoT3ZlcmZsb3cgdmlzdWFsT3Zl cmZsb3dGb3JEZWNvcmF0aW9ucyhjb25zdCBSZW5kZXJTdHlsZSYgbGluZVN0eWxlLCBjb25zdCBJ CiAgICAgICAgIGludCB1bmRlcmxpbmVPZmZzZXQgPSAxOwogICAgICAgICBmbG9hdCB0ZXh0RGVj b3JhdGlvbkJhc2VGb250U2l6ZSA9IDE2OwogICAgICAgICBhdXRvIGRlZmF1bHRHYXAgPSBsaW5l U3R5bGUuY29tcHV0ZWRGb250U2l6ZSgpIC8gdGV4dERlY29yYXRpb25CYXNlRm9udFNpemU7Ci0g ICAgICAgIHVuZGVybGluZU9mZnNldCArPSBjb21wdXRlVW5kZXJsaW5lT2Zmc2V0KGxpbmVTdHls ZS50ZXh0VW5kZXJsaW5lUG9zaXRpb24oKSwgbGluZVN0eWxlLnRleHRVbmRlcmxpbmVPZmZzZXQo KSwgbGluZVN0eWxlLm1ldHJpY3NPZlByaW1hcnlGb250KCksIHRleHRSdW4sIGRlZmF1bHRHYXAp OworICAgICAgICAvLyBGSVhNRTogUmVuZGVyU3R5bGUgY2FsbHMgdXMgd2l0aCBlbXB0eSB0ZXh0 UnVuIGJ1dCBvbmx5IHdoZW4gVGV4dFVuZGVybGluZVBvc2l0aW9uIGlzIG5vdCBVbmRlci4gCisg ICAgICAgIEFTU0VSVCh0ZXh0UnVuIHx8IGxpbmVTdHlsZS50ZXh0VW5kZXJsaW5lUG9zaXRpb24o KSAhPSBUZXh0VW5kZXJsaW5lUG9zaXRpb246OlVuZGVyKTsKKyAgICAgICAgaWYgKCF0ZXh0UnVu KQorICAgICAgICAgICAgdW5kZXJsaW5lT2Zmc2V0ICs9IGNvbXB1dGVVbmRlcmxpbmVPZmZzZXQo eyBsaW5lU3R5bGUsIGRlZmF1bHRHYXAgfSk7CisgICAgICAgIGVsc2UgeworICAgICAgICAgICAg dW5kZXJsaW5lT2Zmc2V0ICs9IGNvbXB1dGVVbmRlcmxpbmVPZmZzZXQoeyBsaW5lU3R5bGUKKyAg ICAgICAgICAgICAgICAsIGRlZmF1bHRHYXAKKyAgICAgICAgICAgICAgICAsICZ0ZXh0UnVuLT5y ZW5kZXJlcigpCisgICAgICAgICAgICAgICAgLCB0ZXh0UnVuLT5saW5lQm94KCktPmJhc2VsaW5l VHlwZSgpCisgICAgICAgICAgICAgICAgLCB0ZXh0UnVuLT5sb2dpY2FsVG9wKCkKKyAgICAgICAg ICAgICAgICAsIHRleHRSdW4tPmxvZ2ljYWxCb3R0b20oKQorICAgICAgICAgICAgICAgICwgdGV4 dFJ1bi0+bGluZUJveCgpCisgICAgICAgICAgICB9KTsKKyAgICAgICAgfQorCiAgICAgICAgIGlm IChkZWNvcmF0aW9uU3R5bGUgPT0gVGV4dERlY29yYXRpb25TdHlsZTo6V2F2eSkgewogICAgICAg ICAgICAgb3ZlcmZsb3dSZXN1bHQuZXh0ZW5kQm90dG9tKHVuZGVybGluZU9mZnNldCArIHdhdnlP ZmZzZXQgKyB3YXZ5U3Ryb2tlUGFyYW1ldGVycy5jb250cm9sUG9pbnREaXN0YW5jZSArIHN0cm9r ZVRoaWNrbmVzcyAtIGhlaWdodCk7CiAgICAgICAgICAgICBvdmVyZmxvd1Jlc3VsdC5leHRlbmRU b3AoLSh1bmRlcmxpbmVPZmZzZXQgKyB3YXZ5T2Zmc2V0IC0gd2F2eVN0cm9rZVBhcmFtZXRlcnMu Y29udHJvbFBvaW50RGlzdGFuY2UgLSBzdHJva2VUaGlja25lc3MpKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3N0eWxlL0lubGluZVRleHRCb3hTdHlsZS5oIGIvU291cmNlL1dlYkNvcmUv c3R5bGUvSW5saW5lVGV4dEJveFN0eWxlLmgKaW5kZXggYzg3ODIzMzhmNzRiLi4zYmMzNDJhZjE2 YjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0eWxlL0lubGluZVRleHRCb3hTdHlsZS5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0eWxlL0lubGluZVRleHRCb3hTdHlsZS5oCkBAIC0yNyw2 ICsyNyw3IEBACiAKICNpbmNsdWRlICJGb250Q2FzY2FkZS5oIgogI2luY2x1ZGUgIklubGluZUl0 ZXJhdG9yQm94LmgiCisjaW5jbHVkZSAiSW5saW5lSXRlcmF0b3JMaW5lQm94LmgiCiAjaW5jbHVk ZSAiUmVuZGVyU3R5bGVDb25zdGFudHMuaCIKIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNTMs NiArNTQsMTYgQEAgc3RydWN0IFdhdnlTdHJva2VQYXJhbWV0ZXJzIHsKIH07CiBXYXZ5U3Ryb2tl UGFyYW1ldGVycyBnZXRXYXZ5U3Ryb2tlUGFyYW1ldGVycyhmbG9hdCBmb250U2l6ZSk7CiBHbHlw aE92ZXJmbG93IHZpc3VhbE92ZXJmbG93Rm9yRGVjb3JhdGlvbnMoY29uc3QgUmVuZGVyU3R5bGUm IGxpbmVTdHlsZSwgY29uc3QgSW5saW5lSXRlcmF0b3I6OlRleHRCb3hJdGVyYXRvciYpOwotZmxv YXQgY29tcHV0ZVVuZGVybGluZU9mZnNldChUZXh0VW5kZXJsaW5lUG9zaXRpb24sIFRleHRVbmRl cmxpbmVPZmZzZXQsIGNvbnN0IEZvbnRNZXRyaWNzJiwgY29uc3QgSW5saW5lSXRlcmF0b3I6OlRl eHRCb3hJdGVyYXRvciYsIGZsb2F0IHRleHREZWNvcmF0aW9uVGhpY2tuZXNzKTsKKworc3RydWN0 IFVuZGVybGluZU9mZnNldEFyZ3VtZW50cyB7CisgICAgY29uc3QgUmVuZGVyU3R5bGUmIGxpbmVT dHlsZTsKKyAgICBmbG9hdCBkZWZhdWx0R2FwIHsgMCB9OworICAgIGNvbnN0IFJlbmRlclRleHQq IHJlbmRlcmVyIHsgbnVsbHB0ciB9OworICAgIEZvbnRCYXNlbGluZSBiYXNlbGluZVR5cGUgeyBB bHBoYWJldGljQmFzZWxpbmUgfTsKKyAgICBmbG9hdCB0ZXh0UnVuTG9naWNhbFRvcCB7IDAgfTsK KyAgICBmbG9hdCB0ZXh0UnVuTG9naWNhbEJvdHRvbSB7IDAgfTsKKyAgICBJbmxpbmVJdGVyYXRv cjo6TGluZUJveEl0ZXJhdG9yIGxpbmVCb3ggeyB9OworfTsKK2Zsb2F0IGNvbXB1dGVVbmRlcmxp bmVPZmZzZXQoY29uc3QgVW5kZXJsaW5lT2Zmc2V0QXJndW1lbnRzJik7CiAgICAgCiB9IC8vIG5h bWVzcGFjZSBXZWJDb3JlCi0tIAoyLjMyLjAgKEFwcGxlIEdpdC0xMzIpCgo=