229658 2021-08-29 14:32:44 -0700 [LFC][IFC] Introduce Line::Run::Text to hold text content related properties 2021-08-30 07:13:20 -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 1788411 0 zalan 2021-08-29 14:32:44 -0700 instead of using LineRun::Text 1788414 1 436749 zalan 2021-08-29 14:36:53 -0700 Created attachment 436749 Patch 1788487 2 ews-feeder 2021-08-30 07:12:52 -0700 Committed r281754 (241096@main): <https://commits.webkit.org/241096@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 436749. 1788488 3 webkit-bug-importer 2021-08-30 07:13:20 -0700 <rdar://problem/82527323> 436749 2021-08-29 14:36:53 -0700 2021-08-30 07:12:53 -0700 Patch bug-229658-20210829143652.patch text/plain 12608 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNzQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjM5MDU1ZGE1ZjU1Yzhh Y2M0MTVkMDVkNzdmNjE5Y2E1MWNkNTJiNi4uYzk5MDIwMzA3MThjYmEzN2E5NWEwN2ZhNGEyNWEx NWE5YmEzYTg5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDIxLTA4LTI5ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIEludHJvZHVj ZSBMaW5lOjpSdW46OlRleHQgdG8gaG9sZCB0ZXh0IGNvbnRlbnQgcmVsYXRlZCBwcm9wZXJ0aWVz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjk2NTgK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMZXQncyB1 c2UgYSBkZWRpY2F0ZWQgKGFuZCBtb3JlIGNvbXBhY3QpIHN0cnVjdHVyZSBoZXJlIGluc3RlYWQg b2YgcmVseWluZyBvbiBhIGRpc3BsYXkgdHlwZSBvZiBzdHJ1Y3R1cmUuCisgICAgICAgIFRoaXMg aXMgaW4gcHJlcGFyYXRpb24gZm9yIG1lcmdpbmcgdGhlIGRpc3BsYXkgYW5kIHRoZSBpbnRlZ3Jh dGlvbiBydW5zLgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpjcmVhdGVSdW5zQW5kVXBkYXRlR2VvbWV0 cnlGb3JMaW5lQ29udGVudCk6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lTGluZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OmFw cGx5UnVuRXhwYW5zaW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6VHJpbW1h YmxlVHJhaWxpbmdDb250ZW50OjpyZW1vdmUpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpM aW5lOjpSdW46OlJ1bik6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Om1fdGV4dENvbnRlbnQp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpSdW46OmV4cGFuZCk6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OlJ1bjo6cmVtb3ZlVHJhaWxpbmdXaGl0ZXNwYWNlKToK KyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmg6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OlJ1bjo6dGV4dENvbnRlbnQgY29uc3Qp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpSdW46OnNldE5lZWRzSHlwaGVuKToK KyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVp bGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpjbG9zZSk6 CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZVJ1 bi5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lUnVuOjpUZXh0OjpuZWVkc0h5cGhl biBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVSdW46OlRleHQ6OlRleHQp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lUnVuOjpUZXh0OjpzZXROZWVkc0h5cGhl bik6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVSdW46OlRleHQ6OmV4 cGFuZCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVSdW46OlRleHQ6 OnNocmluayk6IERlbGV0ZWQuCisKIDIwMjEtMDgtMjkgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBw bGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gTW92ZSAibGluZSBuZWVkcyBpbnRlZ3JhbCBz bmFwcGluZyIgY29tcHV0aW5nIHRvIElGQyBmcm9tIHRoZSBpbnRlZ3JhdGlvbiBsYXllcgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9m b3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAK aW5kZXggNzZkM2ZmZDQ1NmI2OTgzNjg2YjI1YTM4MTM1ZjQ3ZmEwNjQ2NTUzYy4uMzAyMWVmZmY1 ZDFmNmE2MDMzYzRhN2UzNTIyZGNlNTZlNzNiODZkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRC dWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCkBAIC04OCwxMyArODgsMTgg QEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmNyZWF0ZVJ1bnNBbmRVcGRhdGVH ZW9tZXRyeUZvckxpbmVDb250ZW50KGNvbnMKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAg ICAgICAgcmV0dXJuIGlua092ZXJmbG93OwogICAgICAgICAgICAgfTsKLSAgICAgICAgICAgIGZv cm1hdHRpbmdTdGF0ZS5hZGRMaW5lUnVuKHsgbGluZUluZGV4LCBMaW5lUnVuOjpUeXBlOjpUZXh0 LCBsYXlvdXRCb3gsIHRleHRSdW5SZWN0LCBpbmtPdmVyZmxvdygpLCBsaW5lUnVuLmV4cGFuc2lv bigpLCBsaW5lUnVuLnRleHRDb250ZW50KCkgfSk7CisgICAgICAgICAgICBBU1NFUlQobGluZVJ1 bi50ZXh0Q29udGVudCgpICYmIGlzPElubGluZVRleHRCb3g+KGxheW91dEJveCkpOworICAgICAg ICAgICAgYXV0byYgdGV4dENvbnRlbnQgPSBsaW5lUnVuLnRleHRDb250ZW50KCk7CisgICAgICAg ICAgICBmb3JtYXR0aW5nU3RhdGUuYWRkTGluZVJ1bih7IGxpbmVJbmRleCwgTGluZVJ1bjo6VHlw ZTo6VGV4dCwgbGF5b3V0Qm94LCB0ZXh0UnVuUmVjdCwgaW5rT3ZlcmZsb3coKSwgbGluZVJ1bi5l eHBhbnNpb24oKSwgTGluZVJ1bjo6VGV4dCB7IHRleHRDb250ZW50LT5zdGFydCwgdGV4dENvbnRl bnQtPmxlbmd0aCwgZG93bmNhc3Q8SW5saW5lVGV4dEJveD4obGF5b3V0Qm94KS5jb250ZW50KCks IHRleHRDb250ZW50LT5uZWVkc0h5cGhlbiB9IH0pOwogICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgIH0KICAgICAgICAgY2FzZSBJbmxpbmVJdGVtOjpUeXBlOjpTb2Z0TGluZUJyZWFrOiB7CiAg ICAgICAgICAgICBhdXRvIHNvZnRMaW5lQnJlYWtSdW5SZWN0ID0gbGluZUJveC5sb2dpY2FsUmVj dEZvclRleHRSdW4obGluZVJ1bik7CiAgICAgICAgICAgICBzb2Z0TGluZUJyZWFrUnVuUmVjdC5t b3ZlQnkobGluZUJveExvZ2ljYWxUb3BMZWZ0KTsKLSAgICAgICAgICAgIGZvcm1hdHRpbmdTdGF0 ZS5hZGRMaW5lUnVuKHsgbGluZUluZGV4LCBMaW5lUnVuOjpUeXBlOjpTb2Z0TGluZUJyZWFrLCBs YXlvdXRCb3gsIHNvZnRMaW5lQnJlYWtSdW5SZWN0LCBzb2Z0TGluZUJyZWFrUnVuUmVjdCwgbGlu ZVJ1bi5leHBhbnNpb24oKSwgbGluZVJ1bi50ZXh0Q29udGVudCgpIH0pOworCisgICAgICAgICAg ICBBU1NFUlQobGluZVJ1bi50ZXh0Q29udGVudCgpICYmIGlzPElubGluZVRleHRCb3g+KGxheW91 dEJveCkpOworICAgICAgICAgICAgYXV0byYgdGV4dENvbnRlbnQgPSBsaW5lUnVuLnRleHRDb250 ZW50KCk7CisgICAgICAgICAgICBmb3JtYXR0aW5nU3RhdGUuYWRkTGluZVJ1bih7IGxpbmVJbmRl eCwgTGluZVJ1bjo6VHlwZTo6U29mdExpbmVCcmVhaywgbGF5b3V0Qm94LCBzb2Z0TGluZUJyZWFr UnVuUmVjdCwgc29mdExpbmVCcmVha1J1blJlY3QsIGxpbmVSdW4uZXhwYW5zaW9uKCksIExpbmVS dW46OlRleHQgeyB0ZXh0Q29udGVudC0+c3RhcnQsIHRleHRDb250ZW50LT5sZW5ndGgsIGRvd25j YXN0PElubGluZVRleHRCb3g+KGxheW91dEJveCkuY29udGVudCgpLCB0ZXh0Q29udGVudC0+bmVl ZHNIeXBoZW4gfSB9KTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgICAgIGNh c2UgSW5saW5lSXRlbTo6VHlwZTo6SGFyZExpbmVCcmVhazogewpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVM aW5lLmNwcAppbmRleCBlZjFmNGYwNGEzYTNlM2I4Mzk4NmY0N2U0OGI0NmZkOGUwNmI5ODEzLi5m YjllZTQ5NDhlZTk1ZTliMjA2ZjU0YjFmYzZlNmRmNDc2ZjFhNTczIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9J bmxpbmVMaW5lLmNwcApAQCAtOTYsNyArOTYsNyBAQCB2b2lkIExpbmU6OmFwcGx5UnVuRXhwYW5z aW9uKElubGluZUxheW91dFVuaXQgZXh0cmFIb3Jpem9udGFsU3BhY2UpCiAgICAgICAgICAgICAg ICAgZXhwYW5zaW9uQmVoYXZpb3IgPSBGb3JiaWRMZWZ0RXhwYW5zaW9uIHwgRm9yYmlkUmlnaHRF eHBhbnNpb247CiAgICAgICAgICAgICBlbHNlIHsKICAgICAgICAgICAgICAgICBleHBhbnNpb25C ZWhhdmlvciA9IChydW5Jc0FmdGVyRXhwYW5zaW9uID8gRm9yYmlkTGVmdEV4cGFuc2lvbiA6IEFs bG93TGVmdEV4cGFuc2lvbikgfCBBbGxvd1JpZ2h0RXhwYW5zaW9uOwotICAgICAgICAgICAgICAg IHN0ZDo6dGllKGV4cGFuc2lvbk9wcG9ydHVuaXRpZXNJblJ1biwgcnVuSXNBZnRlckV4cGFuc2lv bikgPSBGb250Q2FzY2FkZTo6ZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudChTdHJpbmdWaWV3KHJ1 bi50ZXh0Q29udGVudCgpLT5jb250ZW50KCkpLnN1YnN0cmluZyhydW4udGV4dENvbnRlbnQoKS0+ c3RhcnQoKSwgcnVuLnRleHRDb250ZW50KCktPmxlbmd0aCgpKSwgcnVuLnN0eWxlKCkuZGlyZWN0 aW9uKCksIGV4cGFuc2lvbkJlaGF2aW9yKTsKKyAgICAgICAgICAgICAgICBzdGQ6OnRpZShleHBh bnNpb25PcHBvcnR1bml0aWVzSW5SdW4sIHJ1bklzQWZ0ZXJFeHBhbnNpb24pID0gRm9udENhc2Nh ZGU6OmV4cGFuc2lvbk9wcG9ydHVuaXR5Q291bnQoU3RyaW5nVmlldyhkb3duY2FzdDxJbmxpbmVU ZXh0Qm94PihydW4ubGF5b3V0Qm94KCkpLmNvbnRlbnQoKSkuc3Vic3RyaW5nKHJ1bi50ZXh0Q29u dGVudCgpLT5zdGFydCwgcnVuLnRleHRDb250ZW50KCktPmxlbmd0aCksIHJ1bi5zdHlsZSgpLmRp cmVjdGlvbigpLCBleHBhbnNpb25CZWhhdmlvcik7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0g ZWxzZSBpZiAocnVuLmlzQm94KCkpCiAgICAgICAgICAgICBydW5Jc0FmdGVyRXhwYW5zaW9uID0g ZmFsc2U7CkBAIC00MjgsNyArNDI4LDcgQEAgSW5saW5lTGF5b3V0VW5pdCBMaW5lOjpUcmltbWFi bGVUcmFpbGluZ0NvbnRlbnQ6OnJlbW92ZSgpCiAgICAgICAgIEFTU0VSVChydW4uaXNXb3JkQnJl YWtPcHBvcnR1bml0eSgpIHx8IHJ1bi5pc0lubGluZUJveFN0YXJ0KCkgfHwgcnVuLmlzSW5saW5l Qm94RW5kKCkgfHwgcnVuLmlzTGluZUJyZWFrKCkpOwogICAgICAgICBydW4ubW92ZUhvcml6b250 YWxseSgtdHJpbW1hYmxlV2lkdGgpOwogICAgIH0KLSAgICBpZiAoIXRyaW1tYWJsZVJ1bi50ZXh0 Q29udGVudCgpLT5sZW5ndGgoKSkgeworICAgIGlmICghdHJpbW1hYmxlUnVuLnRleHRDb250ZW50 KCktPmxlbmd0aCkgewogICAgICAgICAvLyBUaGlzIHRyaW1tYWJsZSBydW4gaXMgZnVsbHkgY29s bGFwc2VkIG5vdyAoZS5nLiA8ZGl2PjxpbWc+ICAgIDxzcGFuPjwvc3Bhbj48L2Rpdj4pLgogICAg ICAgICAvLyBXZSBkb24ndCBuZWVkIHRvIGtlZXAgaXQgYXJvdW5kIGFueW1vcmUuCiAgICAgICAg IG1fcnVucy5yZW1vdmUoKm1fZmlyc3RUcmltbWFibGVSdW5JbmRleCk7CkBAIC00NTcsNyArNDU3 LDcgQEAgTGluZTo6UnVuOjpSdW4oY29uc3QgSW5saW5lU29mdExpbmVCcmVha0l0ZW0mIHNvZnRM aW5lQnJlYWtJdGVtLCBJbmxpbmVMYXlvdXRVbmkKICAgICA6IG1fdHlwZShzb2Z0TGluZUJyZWFr SXRlbS50eXBlKCkpCiAgICAgLCBtX2xheW91dEJveCgmc29mdExpbmVCcmVha0l0ZW0ubGF5b3V0 Qm94KCkpCiAgICAgLCBtX2xvZ2ljYWxMZWZ0KGxvZ2ljYWxMZWZ0KQotICAgICwgbV90ZXh0Q29u dGVudCh7IHNvZnRMaW5lQnJlYWtJdGVtLnBvc2l0aW9uKCksIDEsIHNvZnRMaW5lQnJlYWtJdGVt LmlubGluZVRleHRCb3goKS5jb250ZW50KCkgfSkKKyAgICAsIG1fdGV4dENvbnRlbnQoeyBzb2Z0 TGluZUJyZWFrSXRlbS5wb3NpdGlvbigpLCAxIH0pCiB7CiB9CiAKQEAgLTQ2OCw3ICs0NjgsNyBA QCBMaW5lOjpSdW46OlJ1bihjb25zdCBJbmxpbmVUZXh0SXRlbSYgaW5saW5lVGV4dEl0ZW0sIElu bGluZUxheW91dFVuaXQgbG9naWNhbExlZgogICAgICwgbV9sb2dpY2FsV2lkdGgobG9naWNhbFdp ZHRoKQogICAgICwgbV90cmFpbGluZ1doaXRlc3BhY2VUeXBlKHRyYWlsaW5nV2hpdGVzcGFjZVR5 cGUoaW5saW5lVGV4dEl0ZW0pKQogICAgICwgbV90cmFpbGluZ1doaXRlc3BhY2VXaWR0aChtX3Ry YWlsaW5nV2hpdGVzcGFjZVR5cGUgIT0gVHJhaWxpbmdXaGl0ZXNwYWNlOjpOb25lID8gbG9naWNh bFdpZHRoIDogSW5saW5lTGF5b3V0VW5pdCB7IH0pCi0gICAgLCBtX3RleHRDb250ZW50KHsgaW5s aW5lVGV4dEl0ZW0uc3RhcnQoKSwgbV90cmFpbGluZ1doaXRlc3BhY2VUeXBlID09IFRyYWlsaW5n V2hpdGVzcGFjZTo6Q29sbGFwc2VkID8gMSA6IGlubGluZVRleHRJdGVtLmxlbmd0aCgpLCBpbmxp bmVUZXh0SXRlbS5pbmxpbmVUZXh0Qm94KCkuY29udGVudCgpIH0pCisgICAgLCBtX3RleHRDb250 ZW50KHsgaW5saW5lVGV4dEl0ZW0uc3RhcnQoKSwgbV90cmFpbGluZ1doaXRlc3BhY2VUeXBlID09 IFRyYWlsaW5nV2hpdGVzcGFjZTo6Q29sbGFwc2VkID8gMSA6IGlubGluZVRleHRJdGVtLmxlbmd0 aCgpIH0pCiB7CiB9CiAKQEAgLTQ4MywxMSArNDgzLDExIEBAIHZvaWQgTGluZTo6UnVuOjpleHBh bmQoY29uc3QgSW5saW5lVGV4dEl0ZW0mIGlubGluZVRleHRJdGVtLCBJbmxpbmVMYXlvdXRVbml0 IGxvCiAKICAgICBpZiAobV90cmFpbGluZ1doaXRlc3BhY2VUeXBlID09IFRyYWlsaW5nV2hpdGVz cGFjZTo6Tm9uZSkgewogICAgICAgICBtX3RyYWlsaW5nV2hpdGVzcGFjZVdpZHRoID0geyB9Owot ICAgICAgICBtX3RleHRDb250ZW50LT5leHBhbmQoaW5saW5lVGV4dEl0ZW0ubGVuZ3RoKCkpOwor ICAgICAgICBtX3RleHRDb250ZW50LT5sZW5ndGggKz0gaW5saW5lVGV4dEl0ZW0ubGVuZ3RoKCk7 CiAgICAgICAgIHJldHVybjsKICAgICB9CiAgICAgbV90cmFpbGluZ1doaXRlc3BhY2VXaWR0aCAr PSBsb2dpY2FsV2lkdGg7Ci0gICAgbV90ZXh0Q29udGVudC0+ZXhwYW5kKG1fdHJhaWxpbmdXaGl0 ZXNwYWNlVHlwZSA9PSBUcmFpbGluZ1doaXRlc3BhY2U6OkNvbGxhcHNlZCA/IDEgOiBpbmxpbmVU ZXh0SXRlbS5sZW5ndGgoKSk7CisgICAgbV90ZXh0Q29udGVudC0+bGVuZ3RoICs9IG1fdHJhaWxp bmdXaGl0ZXNwYWNlVHlwZSA9PSBUcmFpbGluZ1doaXRlc3BhY2U6OkNvbGxhcHNlZCA/IDEgOiBp bmxpbmVUZXh0SXRlbS5sZW5ndGgoKTsKIH0KIAogYm9vbCBMaW5lOjpSdW46Omhhc1RyYWlsaW5n TGV0dGVyU3BhY2luZygpIGNvbnN0CkBAIC01MTMsOSArNTEzLDkgQEAgdm9pZCBMaW5lOjpSdW46 OnJlbW92ZVRyYWlsaW5nV2hpdGVzcGFjZSgpCiB7CiAgICAgLy8gQWNjb3JkaW5nIHRvIGh0dHBz Oi8vd3d3LnczLm9yZy9UUi9jc3MtdGV4dC0zLyN3aGl0ZS1zcGFjZS1wcm9wZXJ0eSBtYXRyaXgK ICAgICAvLyBUcmltbWFibGUgd2hpdGVzcGFjZSBpcyBhbHdheXMgY29sbGFwc2libGUgc28gdGhl IGxlbmd0aCBvZiB0aGUgdHJhaWxpbmcgdHJpbW1hYmxlIHdoaXRlc3BhY2UgaXMgYWx3YXlzIDEg KG9yIG5vbi1leGlzdGVudCkuCi0gICAgQVNTRVJUKG1fdGV4dENvbnRlbnQtPmxlbmd0aCgpKTsK KyAgICBBU1NFUlQobV90ZXh0Q29udGVudC0+bGVuZ3RoKTsKICAgICBjb25zdGV4cHIgc2l6ZV90 IHRyYWlsaW5nVHJpbW1hYmxlQ29udGVudExlbmd0aCA9IDE7Ci0gICAgbV90ZXh0Q29udGVudC0+ c2hyaW5rKHRyYWlsaW5nVHJpbW1hYmxlQ29udGVudExlbmd0aCk7CisgICAgbV90ZXh0Q29udGVu dC0+bGVuZ3RoIC09IHRyYWlsaW5nVHJpbW1hYmxlQ29udGVudExlbmd0aDsKICAgICB2aXN1YWxs eUNvbGxhcHNlVHJhaWxpbmdXaGl0ZXNwYWNlKG1fdHJhaWxpbmdXaGl0ZXNwYWNlV2lkdGgpOwog fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVMaW5lLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmgKaW5kZXggMzZhZTc3ZmIxMDQ5NDhjN2NlMTNjM2Rh ZmVhMTNmYjJmOTNhYWNmMy4uY2IwYmFiNzM4YzljOWY0Njk1MjY0ZjZkNjllOWEwYTM5NWMyYjg0 NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lTGluZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuaApAQCAtNzIsNyArNzIsMTIgQEAgcHVibGljOgog CiAgICAgICAgIGNvbnN0IEJveCYgbGF5b3V0Qm94KCkgY29uc3QgeyByZXR1cm4gKm1fbGF5b3V0 Qm94OyB9CiAgICAgICAgIGNvbnN0IFJlbmRlclN0eWxlJiBzdHlsZSgpIGNvbnN0IHsgcmV0dXJu IG1fbGF5b3V0Qm94LT5zdHlsZSgpOyB9Ci0gICAgICAgIGNvbnN0IHN0ZDo6b3B0aW9uYWw8TGlu ZVJ1bjo6VGV4dD4mIHRleHRDb250ZW50KCkgY29uc3QgeyByZXR1cm4gbV90ZXh0Q29udGVudDsg fQorICAgICAgICBzdHJ1Y3QgVGV4dCB7CisgICAgICAgICAgICBzaXplX3Qgc3RhcnQgeyAwIH07 CisgICAgICAgICAgICBzaXplX3QgbGVuZ3RoIHsgMCB9OworICAgICAgICAgICAgYm9vbCBuZWVk c0h5cGhlbiB7IGZhbHNlIH07CisgICAgICAgIH07CisgICAgICAgIGNvbnN0IHN0ZDo6b3B0aW9u YWw8VGV4dD4mIHRleHRDb250ZW50KCkgY29uc3QgeyByZXR1cm4gbV90ZXh0Q29udGVudDsgfQog CiAgICAgICAgIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKCkgY29uc3QgeyByZXR1cm4g bV9sb2dpY2FsV2lkdGg7IH0KICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsTGVmdCgp IGNvbnN0IHsgcmV0dXJuIG1fbG9naWNhbExlZnQ7IH0KQEAgLTExOCw3ICsxMjMsNyBAQCBwdWJs aWM6CiAgICAgICAgIElubGluZUxheW91dFVuaXQgbV9sb2dpY2FsV2lkdGggeyAwIH07CiAgICAg ICAgIFRyYWlsaW5nV2hpdGVzcGFjZSBtX3RyYWlsaW5nV2hpdGVzcGFjZVR5cGUgeyBUcmFpbGlu Z1doaXRlc3BhY2U6Ok5vbmUgfTsKICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBtX3RyYWlsaW5n V2hpdGVzcGFjZVdpZHRoIHsgMCB9OwotICAgICAgICBzdGQ6Om9wdGlvbmFsPExpbmVSdW46OlRl eHQ+IG1fdGV4dENvbnRlbnQ7CisgICAgICAgIHN0ZDo6b3B0aW9uYWw8VGV4dD4gbV90ZXh0Q29u dGVudDsKICAgICAgICAgTGluZVJ1bjo6RXhwYW5zaW9uIG1fZXhwYW5zaW9uOwogICAgIH07CiAg ICAgdXNpbmcgUnVuTGlzdCA9IFZlY3RvcjxSdW4sIDEwPjsKQEAgLTE5Miw3ICsxOTcsNyBAQCBp bmxpbmUgTGluZTo6UnVuOjpUcmFpbGluZ1doaXRlc3BhY2UgTGluZTo6UnVuOjp0cmFpbGluZ1do aXRlc3BhY2VUeXBlKGNvbnN0IElubAogaW5saW5lIHZvaWQgTGluZTo6UnVuOjpzZXROZWVkc0h5 cGhlbihJbmxpbmVMYXlvdXRVbml0IGh5cGhlbkxvZ2ljYWxXaWR0aCkKIHsKICAgICBBU1NFUlQo bV90ZXh0Q29udGVudCk7Ci0gICAgbV90ZXh0Q29udGVudC0+c2V0TmVlZHNIeXBoZW4oKTsKKyAg ICBtX3RleHRDb250ZW50LT5uZWVkc0h5cGhlbiA9IHRydWU7CiAgICAgbV9sb2dpY2FsV2lkdGgg Kz0gaHlwaGVuTG9naWNhbFdpZHRoOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5l QnVpbGRlci5jcHAKaW5kZXggYzRlZjM4MWQ2NTIzZDFlZDI5Mjg0ODA4ZmY3NzgyMTY1NDZmN2Ji YS4uZmE1OGE3Y2U2N2NhNzQyOTM3ZjE4MDQ3MzAxZTI1NGUzNWNlNTA2ZCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGlu ZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcApAQCAtMzc1LDcgKzM3NSw3IEBAIExpbmVC dWlsZGVyOjpJbmxpbmVJdGVtUmFuZ2UgTGluZUJ1aWxkZXI6OmNsb3NlKGNvbnN0IElubGluZUl0 ZW1SYW5nZSYgbmVlZHNMYXlvCiAgICAgYXV0byBsaW5lRW5kc1dpdGhIeXBoZW4gPSBmYWxzZTsK ICAgICBpZiAoIW1fbGluZS5ydW5zKCkuaXNFbXB0eSgpKSB7CiAgICAgICAgIGF1dG8mIGxhc3RU ZXh0Q29udGVudCA9IG1fbGluZS5ydW5zKCkubGFzdCgpLnRleHRDb250ZW50KCk7Ci0gICAgICAg IGxpbmVFbmRzV2l0aEh5cGhlbiA9IGxhc3RUZXh0Q29udGVudCAmJiBsYXN0VGV4dENvbnRlbnQt Pm5lZWRzSHlwaGVuKCk7CisgICAgICAgIGxpbmVFbmRzV2l0aEh5cGhlbiA9IGxhc3RUZXh0Q29u dGVudCAmJiBsYXN0VGV4dENvbnRlbnQtPm5lZWRzSHlwaGVuOwogICAgIH0KICAgICBtX3N1Y2Nl c3NpdmVIeXBoZW5hdGVkTGluZUNvdW50ID0gbGluZUVuZHNXaXRoSHlwaGVuID8gbV9zdWNjZXNz aXZlSHlwaGVuYXRlZExpbmVDb3VudCArIDEgOiAwOwogICAgIHJldHVybiBsaW5lUmFuZ2U7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGlu ZS9JbmxpbmVMaW5lUnVuLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVMaW5lUnVuLmgKaW5kZXggZTgxZmQ1MmQyNjYzZDc2MjllZDg5OTk4 Mjk0MmJiMDE1NzBmNzcwMy4uYjk1MTMwZWZjMzI3MTU4MmRkY2QzYzc0ZjRiYzcxYTk2MmViOWI5 ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lTGluZVJ1bi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0 aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVSdW4uaApAQCAtMzksNyArMzksNyBAQCBzdHJ1 Y3QgTGluZVJ1biB7CiAgICAgc3RydWN0IFRleHQgewogICAgICAgICBXVEZfTUFLRV9TVFJVQ1Rf RkFTVF9BTExPQ0FURUQ7CiAgICAgcHVibGljOgotICAgICAgICBUZXh0KHNpemVfdCBwb3NpdGlv biwgc2l6ZV90IGxlbmd0aCwgY29uc3QgU3RyaW5nJik7CisgICAgICAgIFRleHQoc2l6ZV90IHBv c2l0aW9uLCBzaXplX3QgbGVuZ3RoLCBjb25zdCBTdHJpbmcmLCBib29sIG5lZWRzSHlwaGVuID0g ZmFsc2UpOwogCiAgICAgICAgIHNpemVfdCBzdGFydCgpIGNvbnN0IHsgcmV0dXJuIG1fc3RhcnQ7 IH0KICAgICAgICAgc2l6ZV90IGVuZCgpIGNvbnN0IHsgcmV0dXJuIHN0YXJ0KCkgKyBsZW5ndGgo KTsgfQpAQCAtNDcsMTAgKzQ3LDYgQEAgc3RydWN0IExpbmVSdW4gewogICAgICAgICBTdHJpbmcg Y29udGVudCgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGVudFN0cmluZzsgfQogCiAgICAgICAgIGJv b2wgbmVlZHNIeXBoZW4oKSBjb25zdCB7IHJldHVybiBtX25lZWRzSHlwaGVuOyB9Ci0gICAgICAg IHZvaWQgc2V0TmVlZHNIeXBoZW4oKSB7IG1fbmVlZHNIeXBoZW4gPSB0cnVlOyB9Ci0KLSAgICAg ICAgdm9pZCBleHBhbmQoc2l6ZV90IGRlbHRhKSB7IG1fbGVuZ3RoICs9IGRlbHRhOyB9Ci0gICAg ICAgIHZvaWQgc2hyaW5rKHNpemVfdCBkZWx0YSkgeyBtX2xlbmd0aCAtPSBkZWx0YTsgfQogCiAg ICAgcHJpdmF0ZToKICAgICAgICAgc2l6ZV90IG1fc3RhcnQgeyAwIH07CkBAIC0xMzcsOSArMTMz LDEwIEBAIGlubGluZSBMaW5lUnVuOjpMaW5lUnVuKHNpemVfdCBsaW5lSW5kZXgsIFR5cGUgdHlw ZSwgY29uc3QgTGF5b3V0OjpCb3gmIGxheW91dEJvCiB7CiB9CiAKLWlubGluZSBMaW5lUnVuOjpU ZXh0OjpUZXh0KHNpemVfdCBzdGFydCwgc2l6ZV90IGxlbmd0aCwgY29uc3QgU3RyaW5nJiBjb250 ZW50U3RyaW5nKQoraW5saW5lIExpbmVSdW46OlRleHQ6OlRleHQoc2l6ZV90IHN0YXJ0LCBzaXpl X3QgbGVuZ3RoLCBjb25zdCBTdHJpbmcmIGNvbnRlbnRTdHJpbmcsIGJvb2wgbmVlZHNIeXBoZW4p CiAgICAgOiBtX3N0YXJ0KHN0YXJ0KQogICAgICwgbV9sZW5ndGgobGVuZ3RoKQorICAgICwgbV9u ZWVkc0h5cGhlbihuZWVkc0h5cGhlbikKICAgICAsIG1fY29udGVudFN0cmluZyhjb250ZW50U3Ry aW5nKQogewogfQo=