232524 2021-10-29 21:50:22 -0700 [LFC][IFC] Add skeleton implementation for bidi content handling 2021-10-30 10:28:17 -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 1810381 0 zalan 2021-10-29 21:50:22 -0700 ssia 1810383 1 442899 zalan 2021-10-29 21:53:37 -0700 Created attachment 442899 Patch 1810427 2 ews-feeder 2021-10-30 10:27:04 -0700 Committed r285082 (243724@main): <https://commits.webkit.org/243724@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 442899. 1810428 3 webkit-bug-importer 2021-10-30 10:28:17 -0700 <rdar://problem/84840646> 442899 2021-10-29 21:53:37 -0700 2021-10-30 10:27:05 -0700 Patch bug-232524-20211029215336.patch text/plain 13336 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1MDMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmI3MWQyOGRkZjIyNzI4 NWRjM2IwNDNkYzc0ZTkxYzgzM2U2YjIxNy4uYjE3YjQ1NmFjNGFmNTk2M2FmMmVlZjFmZTI2NWU3 ZTU0MWMwODc3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIxLTEwLTI5ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIEFkZCBza2Vs ZXRvbiBpbXBsZW1lbnRhdGlvbiBmb3IgYmlkaSBjb250ZW50IGhhbmRsaW5nCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzI1MjQKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgZGVkaWNhdGVkIGZ1bmN0 aW9ucyBmb3IgaW5saW5lIGNvbnRlbnQgdHlwZXMgdGhhdCBuZWVkIHNlcGFyYXRlIGJpZGkgaGFu ZGxpbmcgKHRleHQgdnMuIGlubGluZSBib3ggdnMuIGF0b21pYyBldGMpLgorCisgICAgICAgICog bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6 Y29sbGVjdENvbnRlbnRJZk5lZWRlZCk6CisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ1N0YXRlLmg6CisgICAgICAgIChXZWJDb3JlOjpM YXlvdXQ6OklubGluZUZvcm1hdHRpbmdTdGF0ZTo6YWRkSW5saW5lSXRlbXMpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nU3RhdGU6OmFkZElubGluZUl0ZW0pOiBE ZWxldGVkLgorICAgICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGlu ZUl0ZW1zQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUl0ZW1z QnVpbGRlcjo6YnVpbGQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVJdGVtc0J1 aWxkZXI6OmNvbGxlY3RJbmxpbmVJdGVtcyk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6Oklu bGluZUl0ZW1zQnVpbGRlcjo6YnJlYWtJbmxpbmVJdGVtc0F0QmlkaUJvdW5kYXJpZXMpOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVJdGVtc0J1aWxkZXI6OmhhbmRsZVRleHRDb250 ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lSXRlbXNCdWlsZGVyOjpoYW5k bGVJbmxpbmVCb3gpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVJdGVtc0J1aWxk ZXI6OmhhbmRsZUlubGluZUxldmVsQm94KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5s aW5lSXRlbXNCdWlsZGVyOjpjcmVhdGVBbmRBcHBlbmRUZXh0SXRlbXMpOiBEZWxldGVkLgorICAg ICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRl ci5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVJdGVtc0J1aWxkZXI6OnJvb3Qg Y29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVJdGVtc0J1aWxkZXI6OmZv cm1hdHRpbmdTdGF0ZSBjb25zdCk6IERlbGV0ZWQuCisKIDIwMjEtMTAtMjkgIEFsYW4gQnVqdGFz ICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gSW5saW5lSXRlbSBzaG91 bGQgbm90IGNyb3NzIGJpZGkgbGV2ZWwgYm91bmRhcnkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1hdHRpbmdDb250 ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCBlNGQxMTdmNWZiZjQ1ZDNmYjdkZTZh ZWIzMTg2NDc3MGUxMzAxNmQ2Li43NWMzMGEyN2I1OTMyMGU2M2Q2ODU2Y2UwMTU1OTE3YTIwN2Qy NmE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQu Y3BwCkBAIC01MjQsNyArNTI0LDcgQEAgdm9pZCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29s bGVjdENvbnRlbnRJZk5lZWRlZCgpCiAgICAgaWYgKCFmb3JtYXR0aW5nU3RhdGUuaW5saW5lSXRl bXMoKS5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybjsKICAgICBhdXRvIGlubGluZUl0ZW1zQnVp bGRlciA9IElubGluZUl0ZW1zQnVpbGRlciB7IHJvb3QoKSwgZm9ybWF0dGluZ1N0YXRlIH07Ci0g ICAgaW5saW5lSXRlbXNCdWlsZGVyLmJ1aWxkKCk7CisgICAgZm9ybWF0dGluZ1N0YXRlLmFkZElu bGluZUl0ZW1zKGlubGluZUl0ZW1zQnVpbGRlci5idWlsZCgpKTsKIH0KIAogSW5saW5lUmVjdCBJ bmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUdlb21ldHJ5Rm9yTGluZUNvbnRlbnQoY29u c3QgTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50JiBsaW5lQ29udGVudCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUZvcm1h dHRpbmdTdGF0ZS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lRm9ybWF0dGluZ1N0YXRlLmgKaW5kZXggOTY1ZTAxMmRmZjhiZTI1ZWUzYWY2 NjBmN2JmYjk3MjFhYTU2YWQ3My4uZjJjMGQwY2IzMWRkMDdjZmMzNzRhZjg5YzkyNWYwNWVmZTE5 YmI4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0 cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ1N0YXRlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRm9ybWF0dGluZ1N0YXRlLmgKQEAg LTUxLDcgKzUxLDcgQEAgcHVibGljOgogCiAgICAgSW5saW5lSXRlbXMmIGlubGluZUl0ZW1zKCkg eyByZXR1cm4gbV9pbmxpbmVJdGVtczsgfQogICAgIGNvbnN0IElubGluZUl0ZW1zJiBpbmxpbmVJ dGVtcygpIGNvbnN0IHsgcmV0dXJuIG1faW5saW5lSXRlbXM7IH0KLSAgICB2b2lkIGFkZElubGlu ZUl0ZW0oSW5saW5lSXRlbSYmIGlubGluZUl0ZW0pIHsgbV9pbmxpbmVJdGVtcy5hcHBlbmQoV1RG TW92ZShpbmxpbmVJdGVtKSk7IH0KKyAgICB2b2lkIGFkZElubGluZUl0ZW1zKElubGluZUl0ZW1z JiYgaW5saW5lSXRlbXMpIHsgbV9pbmxpbmVJdGVtcy5hcHBlbmRWZWN0b3IoV1RGTW92ZShpbmxp bmVJdGVtcykpOyB9CiAKICAgICBjb25zdCBJbmxpbmVMaW5lQm94ZXMmIGxpbmVCb3hlcygpIGNv bnN0IHsgcmV0dXJuIG1fbGluZUJveGVzOyB9CiAgICAgdm9pZCBhZGRMaW5lQm94KExpbmVCb3gm JiBsaW5lQm94KSB7IG1fbGluZUJveGVzLmFwcGVuZChXVEZNb3ZlKGxpbmVCb3gpKTsgfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW5saW5lSXRlbXNCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5n Q29udGV4dHMvaW5saW5lL0lubGluZUl0ZW1zQnVpbGRlci5jcHAKaW5kZXggNzdlN2I3YTk2ZDI0 ODVjZmNkOGNmZmU5ZmI2NGM2MWE3Yzk2Y2YwYy4uM2RjY2ZjNjdmZWM4MjBjYWJjOTU4YWUwN2Ux Y2RiODNjZGVkMzk5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIu Y3BwCkBAIC03NywxMyArNzcsMTkgQEAgSW5saW5lSXRlbXNCdWlsZGVyOjpJbmxpbmVJdGVtc0J1 aWxkZXIoY29uc3QgQ29udGFpbmVyQm94JiBmb3JtYXR0aW5nQ29udGV4dFJvb3QKIHsKIH0KIAot dm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmJ1aWxkKCkKK0lubGluZUl0ZW1zIElubGluZUl0ZW1z QnVpbGRlcjo6YnVpbGQoKQoreworICAgIElubGluZUl0ZW1zIGlubGluZUl0ZW1zOworICAgIGNv bGxlY3RJbmxpbmVJdGVtcyhpbmxpbmVJdGVtcyk7CisgICAgYnJlYWtJbmxpbmVJdGVtc0F0Qmlk aUJvdW5kYXJpZXMoaW5saW5lSXRlbXMpOworICAgIHJldHVybiBpbmxpbmVJdGVtczsKK30KKwor dm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmNvbGxlY3RJbmxpbmVJdGVtcyhJbmxpbmVJdGVtcyYg aW5saW5lSXRlbXMpCiB7CiAgICAgLy8gVHJhdmVyc2UgdGhlIHRyZWUgYW5kIGNyZWF0ZSBpbmxp bmUgaXRlbXMgb3V0IG9mIGlubGluZSBib3hlcyBhbmQgbGVhZiBub2Rlcy4gVGhpcyBlc3NlbnRp YWxseSB0dXJucyB0aGUgdHJlZSBpbmxpbmUgc3RydWN0dXJlIGludG8gYSBmbGF0IG9uZS4KICAg ICAvLyA8c3Bhbj50ZXh0PHNwYW4+PC9zcGFuPjxpbWc+PC9zcGFuPiAtPiBbSW5saW5lQm94U3Rh cnRdW0lubGluZUxldmVsQm94XVtJbmxpbmVCb3hTdGFydF1bSW5saW5lQm94RW5kXVtJbmxpbmVM ZXZlbEJveF1bSW5saW5lQm94RW5kXQogICAgIEFTU0VSVChyb290KCkuaGFzSW5GbG93T3JGbG9h dGluZ0NoaWxkKCkpOwotICAgIGF1dG8mIGZvcm1hdHRpbmdTdGF0ZSA9IHRoaXMtPmZvcm1hdHRp bmdTdGF0ZSgpOwotCiAgICAgVmVjdG9yPGNvbnN0IEJveCo+IGxheW91dFF1ZXVlOwogICAgIGxh eW91dFF1ZXVlLmFwcGVuZChyb290KCkuZmlyc3RDaGlsZCgpKTsKICAgICB3aGlsZSAoIWxheW91 dFF1ZXVlLmlzRW1wdHkoKSkgewpAQCAtOTMsMzEgKzk5LDI4IEBAIHZvaWQgSW5saW5lSXRlbXNC dWlsZGVyOjpidWlsZCgpCiAgICAgICAgICAgICBpZiAoIWlzSW5saW5lQm94V2l0aElubGluZUNv bnRlbnQpCiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAvLyBUaGlzIGlzIHRo ZSBzdGFydCBvZiBhbiBpbmxpbmUgYm94IChlLmcuIDxzcGFuPikuCi0gICAgICAgICAgICBmb3Jt YXR0aW5nU3RhdGUuYWRkSW5saW5lSXRlbSh7IGxheW91dEJveCwgSW5saW5lSXRlbTo6VHlwZTo6 SW5saW5lQm94U3RhcnQgfSk7Ci0gICAgICAgICAgICBhdXRvJiBpbmxpbmVCb3hXaXRoSW5saW5l Q29udGVudCA9IGRvd25jYXN0PENvbnRhaW5lckJveD4obGF5b3V0Qm94KTsKLSAgICAgICAgICAg IGlmICghaW5saW5lQm94V2l0aElubGluZUNvbnRlbnQuaGFzQ2hpbGQoKSkKKyAgICAgICAgICAg IGhhbmRsZUlubGluZUJveChsYXlvdXRCb3gsIEVudGVySW5saW5lQm94OjpZZXMsIGlubGluZUl0 ZW1zKTsKKyAgICAgICAgICAgIGF1dG8mIGlubGluZUJveCA9IGRvd25jYXN0PENvbnRhaW5lckJv eD4obGF5b3V0Qm94KTsKKyAgICAgICAgICAgIGlmICghaW5saW5lQm94Lmhhc0NoaWxkKCkpCiAg ICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBsYXlvdXRRdWV1ZS5hcHBlbmQoaW5s aW5lQm94V2l0aElubGluZUNvbnRlbnQuZmlyc3RDaGlsZCgpKTsKKyAgICAgICAgICAgIGxheW91 dFF1ZXVlLmFwcGVuZChpbmxpbmVCb3guZmlyc3RDaGlsZCgpKTsKICAgICAgICAgfQogCiAgICAg ICAgIHdoaWxlICghbGF5b3V0UXVldWUuaXNFbXB0eSgpKSB7CiAgICAgICAgICAgICBhdXRvJiBs YXlvdXRCb3ggPSAqbGF5b3V0UXVldWUudGFrZUxhc3QoKTsKLSAgICAgICAgICAgIGlmIChsYXlv dXRCb3guaXNPdXRPZkZsb3dQb3NpdGlvbmVkKCkpIHsKKyAgICAgICAgICAgIGlmIChsYXlvdXRC b3guaXNJbmxpbmVUZXh0Qm94KCkpCisgICAgICAgICAgICAgICAgaGFuZGxlVGV4dENvbnRlbnQo ZG93bmNhc3Q8SW5saW5lVGV4dEJveD4obGF5b3V0Qm94KSwgaW5saW5lSXRlbXMpOworICAgICAg ICAgICAgZWxzZSBpZiAobGF5b3V0Qm94LmlzQXRvbWljSW5saW5lTGV2ZWxCb3goKSB8fCBsYXlv dXRCb3guaXNMaW5lQnJlYWtCb3goKSkKKyAgICAgICAgICAgICAgICBoYW5kbGVJbmxpbmVMZXZl bEJveChsYXlvdXRCb3gsIGlubGluZUl0ZW1zKTsKKyAgICAgICAgICAgIGVsc2UgaWYgKGxheW91 dEJveC5pc0lubGluZUJveCgpKQorICAgICAgICAgICAgICAgIGhhbmRsZUlubGluZUJveChsYXlv dXRCb3gsIEVudGVySW5saW5lQm94OjpObywgaW5saW5lSXRlbXMpOworICAgICAgICAgICAgZWxz ZSBpZiAobGF5b3V0Qm94LmlzRmxvYXRpbmdQb3NpdGlvbmVkKCkpCisgICAgICAgICAgICAgICAg aW5saW5lSXRlbXMuYXBwZW5kKHsgbGF5b3V0Qm94LCBJbmxpbmVJdGVtOjpUeXBlOjpGbG9hdCB9 KTsKKyAgICAgICAgICAgIGVsc2UgaWYgKGxheW91dEJveC5pc091dE9mRmxvd1Bvc2l0aW9uZWQo KSkgewogICAgICAgICAgICAgICAgIC8vIExldCdzIG5vdCBjb25zdHJ1Y3QgSW5saW5lSXRlbXMg Zm9yIG91dC1vZi1mbG93IGNvbnRlbnQgYXMgdGhleSBkb24ndCBwYXJ0aWNpcGF0ZSBpbiB0aGUg aW5saW5lIGxheW91dC4KICAgICAgICAgICAgICAgICAvLyBIb3dldmVyIHRvIGJlIGFibGUgdG8g c3RhdGljIHBvc2l0aW9uaW5nIHRoZW0sIHdlIG5lZWQgdG8gY29tcHV0ZSB0aGVpciBhcHByb3hp bWF0ZSBwb3NpdGlvbnMuCi0gICAgICAgICAgICAgICAgZm9ybWF0dGluZ1N0YXRlLmFkZE91dE9m Rmxvd0JveChsYXlvdXRCb3gpOwotICAgICAgICAgICAgfSBlbHNlIGlmIChpczxMaW5lQnJlYWtC b3g+KGxheW91dEJveCkpIHsKLSAgICAgICAgICAgICAgICBhdXRvJiBsaW5lQnJlYWtCb3ggPSBk b3duY2FzdDxMaW5lQnJlYWtCb3g+KGxheW91dEJveCk7Ci0gICAgICAgICAgICAgICAgZm9ybWF0 dGluZ1N0YXRlLmFkZElubGluZUl0ZW0oeyBsYXlvdXRCb3gsIGxpbmVCcmVha0JveC5pc09wdGlv bmFsKCkgPyBJbmxpbmVJdGVtOjpUeXBlOjpXb3JkQnJlYWtPcHBvcnR1bml0eSA6IElubGluZUl0 ZW06OlR5cGU6OkhhcmRMaW5lQnJlYWsgfSk7Ci0gICAgICAgICAgICB9IGVsc2UgaWYgKGxheW91 dEJveC5pc0Zsb2F0aW5nUG9zaXRpb25lZCgpKQotICAgICAgICAgICAgICAgIGZvcm1hdHRpbmdT dGF0ZS5hZGRJbmxpbmVJdGVtKHsgbGF5b3V0Qm94LCBJbmxpbmVJdGVtOjpUeXBlOjpGbG9hdCB9 KTsKLSAgICAgICAgICAgIGVsc2UgaWYgKGxheW91dEJveC5pc0F0b21pY0lubGluZUxldmVsQm94 KCkpCi0gICAgICAgICAgICAgICAgZm9ybWF0dGluZ1N0YXRlLmFkZElubGluZUl0ZW0oeyBsYXlv dXRCb3gsIElubGluZUl0ZW06OlR5cGU6OkJveCB9KTsKLSAgICAgICAgICAgIGVsc2UgaWYgKGxh eW91dEJveC5pc0lubGluZVRleHRCb3goKSkgewotICAgICAgICAgICAgICAgIGNyZWF0ZUFuZEFw cGVuZFRleHRJdGVtcyhkb3duY2FzdDxJbmxpbmVUZXh0Qm94PihsYXlvdXRCb3gpKTsKLSAgICAg ICAgICAgIH0gZWxzZSBpZiAobGF5b3V0Qm94LmlzSW5saW5lQm94KCkpCi0gICAgICAgICAgICAg ICAgZm9ybWF0dGluZ1N0YXRlLmFkZElubGluZUl0ZW0oeyBsYXlvdXRCb3gsIElubGluZUl0ZW06 OlR5cGU6OklubGluZUJveEVuZCB9KTsKLSAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAg ICBtX2Zvcm1hdHRpbmdTdGF0ZS5hZGRPdXRPZkZsb3dCb3gobGF5b3V0Qm94KTsKKyAgICAgICAg ICAgIH0gZWxzZQogICAgICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogCiAgICAg ICAgICAgICBpZiAoYXV0byogbmV4dFNpYmxpbmcgPSBsYXlvdXRCb3gubmV4dFNpYmxpbmcoKSkg ewpAQCAtMTI4LDEzICsxMzEsMTYgQEAgdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmJ1aWxkKCkK ICAgICB9CiB9CiAKLXZvaWQgSW5saW5lSXRlbXNCdWlsZGVyOjpjcmVhdGVBbmRBcHBlbmRUZXh0 SXRlbXMoY29uc3QgSW5saW5lVGV4dEJveCYgaW5saW5lVGV4dEJveCkKK3ZvaWQgSW5saW5lSXRl bXNCdWlsZGVyOjpicmVha0lubGluZUl0ZW1zQXRCaWRpQm91bmRhcmllcyhJbmxpbmVJdGVtcyYp CiB7Ci0gICAgYXV0byYgZm9ybWF0dGluZ1N0YXRlID0gdGhpcy0+Zm9ybWF0dGluZ1N0YXRlKCk7 CisgICAgLy8gRklYTUU6IFVzZSB1YmlkaSB0byBzcGxpdCB0aGUgY29udGVudCBhdCBiaWRpIGJv dW5kYXJpZXMuCit9CiAKK3ZvaWQgSW5saW5lSXRlbXNCdWlsZGVyOjpoYW5kbGVUZXh0Q29udGVu dChjb25zdCBJbmxpbmVUZXh0Qm94JiBpbmxpbmVUZXh0Qm94LCBJbmxpbmVJdGVtcyYgaW5saW5l SXRlbXMpCit7CiAgICAgYXV0byB0ZXh0ID0gaW5saW5lVGV4dEJveC5jb250ZW50KCk7CiAgICAg aWYgKCF0ZXh0Lmxlbmd0aCgpKQotICAgICAgICByZXR1cm4gZm9ybWF0dGluZ1N0YXRlLmFkZElu bGluZUl0ZW0oSW5saW5lVGV4dEl0ZW06OmNyZWF0ZUVtcHR5SXRlbShpbmxpbmVUZXh0Qm94KSk7 CisgICAgICAgIHJldHVybiBpbmxpbmVJdGVtcy5hcHBlbmQoSW5saW5lVGV4dEl0ZW06OmNyZWF0 ZUVtcHR5SXRlbShpbmxpbmVUZXh0Qm94KSk7CiAKICAgICBhdXRvJiBzdHlsZSA9IGlubGluZVRl eHRCb3guc3R5bGUoKTsKICAgICBhdXRvJiBmb250Q2FzY2FkZSA9IHN0eWxlLmZvbnRDYXNjYWRl KCk7CkBAIC0xNTksNyArMTY1LDcgQEAgdm9pZCBJbmxpbmVJdGVtc0J1aWxkZXI6OmNyZWF0ZUFu ZEFwcGVuZFRleHRJdGVtcyhjb25zdCBJbmxpbmVUZXh0Qm94JiBpbmxpbmVUZXgKIAogICAgICAg ICAvLyBTZWdtZW50IGJyZWFrcyB3aXRoIHByZXNlcnZlIG5ldyBsaW5lIHN0eWxlICh3aGl0ZS1z cGFjZTogcHJlLCBwcmUtd3JhcCwgYnJlYWstc3BhY2VzIGFuZCBwcmUtbGluZSkgY29tcHV0ZSB0 byBmb3JjZWQgbGluZSBicmVhay4KICAgICAgICAgaWYgKGlzU2VnbWVudEJyZWFrQ2FuZGlkYXRl KHRleHRbY3VycmVudFBvc2l0aW9uXSkgJiYgc2hvdWxkUHJlc2VydmVOZXdsaW5lKSB7Ci0gICAg ICAgICAgICBmb3JtYXR0aW5nU3RhdGUuYWRkSW5saW5lSXRlbShJbmxpbmVTb2Z0TGluZUJyZWFr SXRlbTo6Y3JlYXRlU29mdExpbmVCcmVha0l0ZW0oaW5saW5lVGV4dEJveCwgY3VycmVudFBvc2l0 aW9uKSk7CisgICAgICAgICAgICBpbmxpbmVJdGVtcy5hcHBlbmQoSW5saW5lU29mdExpbmVCcmVh a0l0ZW06OmNyZWF0ZVNvZnRMaW5lQnJlYWtJdGVtKGlubGluZVRleHRCb3gsIGN1cnJlbnRQb3Np dGlvbikpOwogICAgICAgICAgICAgKytjdXJyZW50UG9zaXRpb247CiAgICAgICAgICAgICBjb250 aW51ZTsKICAgICAgICAgfQpAQCAtMTcwLDcgKzE3Niw3IEBAIHZvaWQgSW5saW5lSXRlbXNCdWls ZGVyOjpjcmVhdGVBbmRBcHBlbmRUZXh0SXRlbXMoY29uc3QgSW5saW5lVGV4dEJveCYgaW5saW5l VGV4CiAgICAgICAgICAgICBhdXRvIGFwcGVuZFdoaXRlc3BhY2VJdGVtID0gWyZdIChhdXRvIHN0 YXJ0UG9zaXRpb24sIGF1dG8gaXRlbUxlbmd0aCkgewogICAgICAgICAgICAgICAgIGF1dG8gc2lt cGxlU2luZ2xlV2hpdGVzcGFjZUNvbnRlbnQgPSBpbmxpbmVUZXh0Qm94LmNhblVzZVNpbXBsaWZp ZWRDb250ZW50TWVhc3VyaW5nKCkgJiYgKGl0ZW1MZW5ndGggPT0gMSB8fCB3aGl0ZXNwYWNlQ29u dGVudElzVHJlYXRlZEFzU2luZ2xlU3BhY2UpOwogICAgICAgICAgICAgICAgIGF1dG8gd2lkdGgg PSBzaW1wbGVTaW5nbGVXaGl0ZXNwYWNlQ29udGVudCA/IHN0ZDo6bWFrZV9vcHRpb25hbChJbmxp bmVMYXlvdXRVbml0IHsgZm9udENhc2NhZGUuc3BhY2VXaWR0aCgpIH0pIDogaW5saW5lSXRlbVdp ZHRoKHN0YXJ0UG9zaXRpb24sIGl0ZW1MZW5ndGgpOwotICAgICAgICAgICAgICAgIGZvcm1hdHRp bmdTdGF0ZS5hZGRJbmxpbmVJdGVtKElubGluZVRleHRJdGVtOjpjcmVhdGVXaGl0ZXNwYWNlSXRl bShpbmxpbmVUZXh0Qm94LCBzdGFydFBvc2l0aW9uLCBpdGVtTGVuZ3RoLCBVQklESV9ERUZBVUxU X0xUUiwgd2hpdGVzcGFjZUNvbnRlbnQtPmlzV29yZFNlcGFyYXRvciwgd2lkdGgpKTsKKyAgICAg ICAgICAgICAgICBpbmxpbmVJdGVtcy5hcHBlbmQoSW5saW5lVGV4dEl0ZW06OmNyZWF0ZVdoaXRl c3BhY2VJdGVtKGlubGluZVRleHRCb3gsIHN0YXJ0UG9zaXRpb24sIGl0ZW1MZW5ndGgsIFVCSURJ X0RFRkFVTFRfTFRSLCB3aGl0ZXNwYWNlQ29udGVudC0+aXNXb3JkU2VwYXJhdG9yLCB3aWR0aCkp OwogICAgICAgICAgICAgfTsKICAgICAgICAgICAgIGlmIChzdHlsZS53aGl0ZVNwYWNlKCkgPT0g V2hpdGVTcGFjZTo6QnJlYWtTcGFjZXMpIHsKICAgICAgICAgICAgICAgICAvLyBodHRwczovL3d3 dy53My5vcmcvVFIvY3NzLXRleHQtMy8jd2hpdGUtc3BhY2UtcGhhc2UtMQpAQCAtMjA3LDkgKzIx MywyNyBAQCB2b2lkIElubGluZUl0ZW1zQnVpbGRlcjo6Y3JlYXRlQW5kQXBwZW5kVGV4dEl0ZW1z KGNvbnN0IElubGluZVRleHRCb3gmIGlubGluZVRleAogICAgICAgICBBU1NFUlQoaW5pdGlhbE5v bldoaXRlc3BhY2VQb3NpdGlvbiA8IGN1cnJlbnRQb3NpdGlvbik7CiAgICAgICAgIEFTU0VSVF9J TVBMSUVTKHN0eWxlLmh5cGhlbnMoKSA9PSBIeXBoZW5zOjpOb25lLCAhaGFzVHJhaWxpbmdTb2Z0 SHlwaGVuKTsKICAgICAgICAgYXV0byBsZW5ndGggPSBjdXJyZW50UG9zaXRpb24gLSBpbml0aWFs Tm9uV2hpdGVzcGFjZVBvc2l0aW9uOwotICAgICAgICBmb3JtYXR0aW5nU3RhdGUuYWRkSW5saW5l SXRlbShJbmxpbmVUZXh0SXRlbTo6Y3JlYXRlTm9uV2hpdGVzcGFjZUl0ZW0oaW5saW5lVGV4dEJv eCwgaW5pdGlhbE5vbldoaXRlc3BhY2VQb3NpdGlvbiwgbGVuZ3RoLCBVQklESV9ERUZBVUxUX0xU UiwgaGFzVHJhaWxpbmdTb2Z0SHlwaGVuLCBpbmxpbmVJdGVtV2lkdGgoaW5pdGlhbE5vbldoaXRl c3BhY2VQb3NpdGlvbiwgbGVuZ3RoKSkpOworICAgICAgICBpbmxpbmVJdGVtcy5hcHBlbmQoSW5s aW5lVGV4dEl0ZW06OmNyZWF0ZU5vbldoaXRlc3BhY2VJdGVtKGlubGluZVRleHRCb3gsIGluaXRp YWxOb25XaGl0ZXNwYWNlUG9zaXRpb24sIGxlbmd0aCwgVUJJRElfREVGQVVMVF9MVFIsIGhhc1Ry YWlsaW5nU29mdEh5cGhlbiwgaW5saW5lSXRlbVdpZHRoKGluaXRpYWxOb25XaGl0ZXNwYWNlUG9z aXRpb24sIGxlbmd0aCkpKTsKICAgICB9CiB9CisKK3ZvaWQgSW5saW5lSXRlbXNCdWlsZGVyOjpo YW5kbGVJbmxpbmVCb3goY29uc3QgQm94JiBpbmxpbmVCb3gsIEVudGVySW5saW5lQm94IGVudGVy SW5saW5lQm94LCBJbmxpbmVJdGVtcyYgaW5saW5lSXRlbXMpCit7CisgICAgLy8gRklYTUU6IElu amVjdCBiaWRpIGNvbnRyb2wgY29kZXMgd2hlbiBjcm9zc2luZyBpbmxpbmUgYm94ZXMgd2l0aCB1 bmljb2RlLWJpZGkvZGlyZWN0aW9uLgorICAgIGlubGluZUl0ZW1zLmFwcGVuZCh7IGlubGluZUJv eCwgZW50ZXJJbmxpbmVCb3ggPT0gRW50ZXJJbmxpbmVCb3g6OlllcyA/IElubGluZUl0ZW06OlR5 cGU6OklubGluZUJveFN0YXJ0IDogSW5saW5lSXRlbTo6VHlwZTo6SW5saW5lQm94RW5kIH0pOwor fQorCit2b2lkIElubGluZUl0ZW1zQnVpbGRlcjo6aGFuZGxlSW5saW5lTGV2ZWxCb3goY29uc3Qg Qm94JiBsYXlvdXRCb3gsIElubGluZUl0ZW1zJiBpbmxpbmVJdGVtcykKK3sKKyAgICBpZiAobGF5 b3V0Qm94LmlzQXRvbWljSW5saW5lTGV2ZWxCb3goKSkKKyAgICAgICAgcmV0dXJuIGlubGluZUl0 ZW1zLmFwcGVuZCh7IGxheW91dEJveCwgSW5saW5lSXRlbTo6VHlwZTo6Qm94IH0pOworCisgICAg aWYgKGxheW91dEJveC5pc0xpbmVCcmVha0JveCgpKQorICAgICAgICByZXR1cm4gaW5saW5lSXRl bXMuYXBwZW5kKHsgbGF5b3V0Qm94LCBkb3duY2FzdDxMaW5lQnJlYWtCb3g+KGxheW91dEJveCku aXNPcHRpb25hbCgpID8gSW5saW5lSXRlbTo6VHlwZTo6V29yZEJyZWFrT3Bwb3J0dW5pdHkgOiBJ bmxpbmVJdGVtOjpUeXBlOjpIYXJkTGluZUJyZWFrIH0pOworCisgICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7Cit9CisKIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lSXRlbXNCdWlsZGVyLmggYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIu aAppbmRleCBkZGQ4ZTZhYzI0OTYzODZiMmFiOWY0ZmZkNjM5MzMwYjQzYWQyMjQ0Li5kYTBmN2E2 NzE2MWI1NWU4ZmFmOTI4NDY4ZWI1MGFlMDI0MTA5MjA5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVJdGVtc0J1aWxkZXIu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9J bmxpbmVJdGVtc0J1aWxkZXIuaApAQCAtMzcsMTUgKzM3LDIxIEBAIGNsYXNzIElubGluZVRleHRC b3g7CiBjbGFzcyBJbmxpbmVJdGVtc0J1aWxkZXIgewogcHVibGljOgogICAgIElubGluZUl0ZW1z QnVpbGRlcihjb25zdCBDb250YWluZXJCb3gmIGZvcm1hdHRpbmdDb250ZXh0Um9vdCwgSW5saW5l Rm9ybWF0dGluZ1N0YXRlJik7Ci0gICAgdm9pZCBidWlsZCgpOworICAgIElubGluZUl0ZW1zIGJ1 aWxkKCk7CiAKIHByaXZhdGU6Ci0gICAgdm9pZCBjcmVhdGVBbmRBcHBlbmRUZXh0SXRlbXMoY29u c3QgSW5saW5lVGV4dEJveCYpOworICAgIHZvaWQgY29sbGVjdElubGluZUl0ZW1zKElubGluZUl0 ZW1zJik7CisgICAgdm9pZCBicmVha0lubGluZUl0ZW1zQXRCaWRpQm91bmRhcmllcyhJbmxpbmVJ dGVtcyYpOworCisgICAgdm9pZCBoYW5kbGVUZXh0Q29udGVudChjb25zdCBJbmxpbmVUZXh0Qm94 JiwgSW5saW5lSXRlbXMmKTsKKyAgICBlbnVtIGNsYXNzIEVudGVySW5saW5lQm94IHsgWWVzLCBO byB9OworICAgIHZvaWQgaGFuZGxlSW5saW5lQm94KGNvbnN0IEJveCYsIEVudGVySW5saW5lQm94 LCBJbmxpbmVJdGVtcyYpOworICAgIHZvaWQgaGFuZGxlSW5saW5lTGV2ZWxCb3goY29uc3QgQm94 JiwgSW5saW5lSXRlbXMmKTsKIAogICAgIGNvbnN0IENvbnRhaW5lckJveCYgcm9vdCgpIGNvbnN0 IHsgcmV0dXJuIG1fcm9vdDsgfQotICAgIElubGluZUZvcm1hdHRpbmdTdGF0ZSYgZm9ybWF0dGlu Z1N0YXRlKCkgY29uc3QgeyByZXR1cm4gbV9mb3JtYXR0aW5nU3RhdGU7IH0KIAogICAgIGNvbnN0 IENvbnRhaW5lckJveCYgbV9yb290OworICAgIC8vIEZJWE1FOiBXZSBzaG91bGQgbm90IG5lZWQg dGhpcyBoZXJlLiBUaGlzIGlzIG9ubHkgcmVxdWlyZWQgYnkgdGhlIG91dCBvZiBmbG93IGJveGVz LgogICAgIElubGluZUZvcm1hdHRpbmdTdGF0ZSYgbV9mb3JtYXR0aW5nU3RhdGU7CiB9OwogCg==