233968 2021-12-07 19:01:48 -0800 [LFC][IFC] Add support for ink overflow on bidi inline boxes 2021-12-09 13:06:41 -0800 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 1821342 0 zalan 2021-12-07 19:01:48 -0800 ssia 1821343 1 446279 zalan 2021-12-07 19:03:54 -0800 Created attachment 446279 Patch 1822184 2 446566 zalan 2021-12-09 10:40:29 -0800 Created attachment 446566 [fast-cq]Patch 1822202 3 ews-feeder 2021-12-09 11:02:25 -0800 Committed r286789 (245030@main): <https://commits.webkit.org/245030@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 446566. 1822283 4 webkit-bug-importer 2021-12-09 13:06:41 -0800 <rdar://problem/86287113> 446279 2021-12-07 19:03:54 -0800 2021-12-09 10:40:27 -0800 Patch bug-233968-20211207190353.patch text/plain 6223 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2NTQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGU2NDM1MTE4YjIxMDM0 ZjI0NGQ3MDNjNmFhNGE1NDUwZmNjMDAyNi4uMWRhZWU0Nzk2MzJiMDc3ZGIyZTM3YTNlY2FmZDNk YmExMGZhYTI2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTEyLTA3ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIEFkZCBzdXBw b3J0IGZvciBpbmsgb3ZlcmZsb3cgb24gYmlkaSBpbmxpbmUgYm94ZXMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzk2OAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjphcHBlbmRJbmxpbmVE aXNwbGF5Qm94QXRCaWRpQm91bmRhcnkpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxp bmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmVuc3VyZURpc3BsYXlCb3hGb3JDb250YWluZXIpOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmFk anVzdFZpc3VhbEdlb21ldHJ5Rm9yQ2hpbGROb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzQmlkaUNvbnRlbnQpOgorICAg ICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250 ZW50QnVpbGRlci5oOgorCiAyMDIxLTEyLTA3ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNv bT4KIAogICAgICAgICBbTEZDXVtJRkNdIE1ha2UgY29sbGVjdElua092ZXJmbG93Rm9ySW5saW5l Qm94ZXMgcHJvcGFnYXRlIGluayBvdmVyZmxvdyB1c2luZyB0aGUgZGlzcGxheSBib3ggbGlzdApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5j cHAKaW5kZXggOWQ5YWNmNThjZTZkZDIxN2Q3ZjRhZWVmYjY1OWM2NTA0MTM1ZmZlNy4uYjRmMGUy N2M4YTU4ZGYyYmY3OWFkYjI1MzU4MTVhYTBkYmVkOGE1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRl bnRCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCkBAIC0yNjYsNiArMjY2 LDE5IEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjphcHBlbmRTcGFubmluZ0lu bGluZUJveERpc3BsYXlCb3goY29uc3QgTGluZTo6CiAgICAgc2V0SW5saW5lQm94R2VvbWV0cnko bGF5b3V0Qm94LCBpbmxpbmVCb3hCb3JkZXJCb3gsIGZhbHNlKTsKIH0KIAordm9pZCBJbmxpbmVE aXNwbGF5Q29udGVudEJ1aWxkZXI6OmFwcGVuZElubGluZURpc3BsYXlCb3hBdEJpZGlCb3VuZGFy eShjb25zdCBCb3gmIGxheW91dEJveCwgRGlzcGxheUJveGVzJiBib3hlcykKK3sKKyAgICAvLyBH ZW9tZXRyaWVzIGZvciBpbmxpbmUgYm94ZXMgYXQgYmlkaSBib3VuZGFyaWVzIGFyZSBjb21wdXRl ZCBhdCBhIHBvc3QtcHJvY2VzcyBzdGVwLgorICAgIGJveGVzLmFwcGVuZCh7IG1fbGluZUluZGV4 CisgICAgICAgICwgSW5saW5lRGlzcGxheTo6Qm94OjpUeXBlOjpOb25Sb290SW5saW5lQm94Cisg ICAgICAgICwgbGF5b3V0Qm94CisgICAgICAgICwgVUJJRElfREVGQVVMVF9MVFIKKyAgICAgICAg LCB7IH0KKyAgICAgICAgLCB7IH0KKyAgICAgICAgLCB7IH0KKyAgICAgICAgLCB7IH0gfSk7Cit9 CisKIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzTm9uQmlkaUNvbnRl bnQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50JiBsaW5lQ29udGVudCwgY29uc3QgTGlu ZUJveCYgbGluZUJveCwgY29uc3QgSW5saW5lTGF5b3V0UG9pbnQmIGxpbmVCb3hMb2dpY2FsVG9w TGVmdCwgRGlzcGxheUJveGVzJiBib3hlcykKIHsKICAgICAvLyBDcmVhdGUgdGhlIGlubGluZSBi b3hlcyBvbiB0aGUgY3VycmVudCBsaW5lLiBUaGlzIGlzIG1vc3RseSB0ZXh0IGFuZCBhdG9taWMg aW5saW5lIGJveGVzLgpAQCAtMzc3LDcgKzM5MCw3IEBAIERpc3BsYXlCb3hOb2RlJiBJbmxpbmVE aXNwbGF5Q29udGVudEJ1aWxkZXI6OmVuc3VyZURpc3BsYXlCb3hGb3JDb250YWluZXIoY29uc3QK ICAgICBpZiAoYXV0byogbG93ZXN0Q29tbW9uQW5jZXN0b3IgPSBhbmNlc3RvclN0YWNrLnVud2lu ZChjb250YWluZXJCb3gpKQogICAgICAgICByZXR1cm4gKmxvd2VzdENvbW1vbkFuY2VzdG9yOwog ICAgIGF1dG8mIGVuY2xvc2luZ0Rpc3BsYXlCb3hOb2RlRm9yQ29udGFpbmVyID0gZW5zdXJlRGlz cGxheUJveEZvckNvbnRhaW5lcihjb250YWluZXJCb3gucGFyZW50KCksIGFuY2VzdG9yU3RhY2ss IGJveGVzKTsKLSAgICBib3hlcy5hcHBlbmQoeyBtX2xpbmVJbmRleCwgSW5saW5lRGlzcGxheTo6 Qm94OjpUeXBlOjpOb25Sb290SW5saW5lQm94LCBjb250YWluZXJCb3gsIFVCSURJX0RFRkFVTFRf TFRSLCB7IH0sIHsgfSwgeyB9LCB7IH0sIHRydWUsIHsgfSB9KTsKKyAgICBhcHBlbmRJbmxpbmVE aXNwbGF5Qm94QXRCaWRpQm91bmRhcnkoY29udGFpbmVyQm94LCBib3hlcyk7CiAgICAgcmV0dXJu IGNyZWF0ZWREaXNwbGF5Qm94Tm9kZUZvckNvbnRhaW5lckJveEFuZFB1c2hUb0FuY2VzdG9yU3Rh Y2soY29udGFpbmVyQm94LCBib3hlcy5zaXplKCkgLSAxLCBlbmNsb3NpbmdEaXNwbGF5Qm94Tm9k ZUZvckNvbnRhaW5lciwgYW5jZXN0b3JTdGFjayk7CiB9CiAKQEAgLTQwMyw3ICs0MTYsNiBAQCB2 b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6YWRqdXN0VmlzdWFsR2VvbWV0cnlGb3JD aGlsZE5vZGUoY29uc3QgRGlzcGxheQogICAgIGF1dG8gYmVmb3JlSW5saW5lQm94Q29udGVudCA9 IFsmXSB7CiAgICAgICAgIGF1dG8gbG9naWNhbFJlY3QgPSBsaW5lQm94LmxvZ2ljYWxCb3JkZXJC b3hGb3JJbmxpbmVCb3gobGF5b3V0Qm94LCBib3hHZW9tZXRyeSk7CiAgICAgICAgIGF1dG8gdmlz dWFsUmVjdCA9IElubGluZVJlY3QgeyBsaW5lQm94TG9naWNhbFRvcCArIGxvZ2ljYWxSZWN0LnRv cCgpLCBjb250ZW50UmlnaHRJblZpc3VhbE9yZGVyLCB7IH0sIGxvZ2ljYWxSZWN0LmhlaWdodCgp IH07Ci0gICAgICAgIC8vIEZJWE1FOiBBZGQgc3VwcG9ydCBmb3IgaW5rIG92ZXJmbG93LgogICAg ICAgICBpZiAoIWRpc3BsYXlCb3guaXNGaXJzdEZvckxheW91dEJveCgpKQogICAgICAgICAgICAg cmV0dXJuIGRpc3BsYXlCb3guc2V0TG9naWNhbFJlY3QodmlzdWFsUmVjdCwgdmlzdWFsUmVjdCk7 CiAKQEAgLTQyNyw2ICs0MzksMTMgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6 OmFkanVzdFZpc3VhbEdlb21ldHJ5Rm9yQ2hpbGROb2RlKGNvbnN0IERpc3BsYXkKICAgICB9Owog ICAgIGFmdGVySW5saW5lQm94Q29udGVudCgpOwogCisgICAgYXV0byBjb21wdXRlSW5rT3ZlcmZs b3cgPSBbJl0geworICAgICAgICBhdXRvIGlua092ZXJmbG93ID0gZGlzcGxheUJveC5sb2dpY2Fs UmVjdCgpOworICAgICAgICBtX2NvbnRlbnRIYXNJbmtPdmVyZmxvdyA9IGNvbXB1dGVCb3hTaGFk b3dJbmtPdmVyZmxvdyghbV9saW5lSW5kZXggPyBsYXlvdXRCb3guZmlyc3RMaW5lU3R5bGUoKSA6 IGxheW91dEJveC5zdHlsZSgpLCBpbmtPdmVyZmxvdykgfHwgbV9jb250ZW50SGFzSW5rT3ZlcmZs b3c7CisgICAgICAgIGRpc3BsYXlCb3guYWRqdXN0SW5rT3ZlcmZsb3coaW5rT3ZlcmZsb3cpOwor ICAgIH07CisgICAgY29tcHV0ZUlua092ZXJmbG93KCk7CisKICAgICBzZXRJbmxpbmVCb3hHZW9t ZXRyeShsYXlvdXRCb3gsIGRpc3BsYXlCb3gubG9naWNhbFJlY3QoKSwgZGlzcGxheUJveC5pc0Zp cnN0Rm9yTGF5b3V0Qm94KCkpOwogICAgIGlmIChsaW5lQm94LmlubGluZUxldmVsQm94Rm9yTGF5 b3V0Qm94KGxheW91dEJveCkuaGFzQ29udGVudCgpKQogICAgICAgICBkaXNwbGF5Qm94LnNldEhh c0NvbnRlbnQoKTsKQEAgLTQ5OCw3ICs1MTcsNyBAQCB2b2lkIElubGluZURpc3BsYXlDb250ZW50 QnVpbGRlcjo6cHJvY2Vzc0JpZGlDb250ZW50KGNvbnN0IExpbmVCdWlsZGVyOjpMaW5lQ29udAog ICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgaWYg KGxpbmVSdW4uaXNJbmxpbmVCb3hTdGFydCgpIHx8IGxpbmVSdW4uaXNMaW5lU3Bhbm5pbmdJbmxp bmVCb3hTdGFydCgpKSB7Ci0gICAgICAgICAgICAgICAgYm94ZXMuYXBwZW5kKHsgbV9saW5lSW5k ZXgsIElubGluZURpc3BsYXk6OkJveDo6VHlwZTo6Tm9uUm9vdElubGluZUJveCwgbGF5b3V0Qm94 LCBVQklESV9ERUZBVUxUX0xUUiwgeyB9LCB7IH0sIHsgfSwgeyB9LCB0cnVlLCB7IH0gfSk7Cisg ICAgICAgICAgICAgICAgYXBwZW5kSW5saW5lRGlzcGxheUJveEF0QmlkaUJvdW5kYXJ5KGxheW91 dEJveCwgYm94ZXMpOwogICAgICAgICAgICAgICAgIGNyZWF0ZWREaXNwbGF5Qm94Tm9kZUZvckNv bnRhaW5lckJveEFuZFB1c2hUb0FuY2VzdG9yU3RhY2soZG93bmNhc3Q8Q29udGFpbmVyQm94Pihs YXlvdXRCb3gpLCBib3hlcy5zaXplKCkgLSAxLCBwYXJlbnREaXNwbGF5Qm94Tm9kZSwgYW5jZXN0 b3JTdGFjayk7CiAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAgICB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9J bmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3Jt YXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5oCmluZGV4 IDI5ZGI0MWI4Y2VkYzM2NmM0ZmE5MGY0NDg5NDBkYjI2NjQ5NjQ2ZDkuLmFmNzAyNjViMDVlYWFi NmNkYmM2N2E2OTZjODBiNTRhNmRiMzJiMGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRl ci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5l L0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5oCkBAIC01OSw2ICs1OSw3IEBAIHByaXZhdGU6 CiAgICAgdm9pZCBhcHBlbmRBdG9taWNJbmxpbmVMZXZlbERpc3BsYXlCb3goY29uc3QgTGluZTo6 UnVuJiwgY29uc3QgSW5saW5lUmVjdCYgLCBEaXNwbGF5Qm94ZXMmKTsKICAgICB2b2lkIGFwcGVu ZElubGluZUJveERpc3BsYXlCb3goY29uc3QgTGluZTo6UnVuJiwgY29uc3QgSW5saW5lTGV2ZWxC b3gmLCBjb25zdCBJbmxpbmVSZWN0JiwgYm9vbCBsaW5laGFzQ29udGVudCwgRGlzcGxheUJveGVz Jik7CiAgICAgdm9pZCBhcHBlbmRTcGFubmluZ0lubGluZUJveERpc3BsYXlCb3goY29uc3QgTGlu ZTo6UnVuJiwgY29uc3QgSW5saW5lTGV2ZWxCb3gmLCBjb25zdCBJbmxpbmVSZWN0JiwgRGlzcGxh eUJveGVzJik7CisgICAgdm9pZCBhcHBlbmRJbmxpbmVEaXNwbGF5Qm94QXRCaWRpQm91bmRhcnko Y29uc3QgQm94JiwgRGlzcGxheUJveGVzJik7CiAKICAgICB2b2lkIHNldElubGluZUJveEdlb21l dHJ5KGNvbnN0IEJveCYsIGNvbnN0IElubGluZVJlY3QmLCBib29sIGlzRmlyc3RJbmxpbmVCb3hG cmFnbWVudCk7CiAgICAgdm9pZCBhZGp1c3RWaXN1YWxHZW9tZXRyeUZvckNoaWxkTm9kZShjb25z dCBEaXNwbGF5Qm94Tm9kZSYsIElubGluZUxheW91dFVuaXQmIGFjY3VtdWxhdGVkT2Zmc2V0LCBJ bmxpbmVMYXlvdXRVbml0IGxpbmVCb3hMb2dpY2FsVG9wLCBEaXNwbGF5Qm94ZXMmLCBjb25zdCBM aW5lQm94Jik7Cg== 446566 2021-12-09 10:40:29 -0800 2021-12-09 11:02:27 -0800 [fast-cq]Patch bug-233968-20211209104029.patch text/plain 8781 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2Nzg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWFkMzkxZDExMjlkNTEz MzdhNTVjYWFjNTVjYzYwODgzOTM1YzcwMi4uYTI1YmNiODZiMmU1NjBkZTkyZTM1NzI0Mzc5OWNi NTMyM2JiZmViZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTEyLTA5ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIEFkZCBzdXBw b3J0IGZvciBpbmsgb3ZlcmZsb3cgb24gYmlkaSBpbmxpbmUgYm94ZXMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzk2OAorCisgICAgICAgIFJldmll d2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjphcHBlbmRJbmxpbmVE aXNwbGF5Qm94QXRCaWRpQm91bmRhcnkpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxp bmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmVuc3VyZURpc3BsYXlCb3hGb3JDb250YWluZXIpOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmFk anVzdFZpc3VhbEdlb21ldHJ5Rm9yQ2hpbGROb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzQmlkaUNvbnRlbnQpOgorICAg ICAgICAqIGxheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250 ZW50QnVpbGRlci5oOgorCiAyMDIxLTEyLTA5ICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNv bT4KIAogICAgICAgICBbTEZDXVtJRkNdIEFkZCBzdXBwb3J0IGZvciBlbXB0eSBiaWRpIGlubGlu ZSBib3hlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50 QnVpbGRlci5jcHAKaW5kZXggMzU1NDc5MjJjOTAwOGU3MTRjNmRkOWU4MzRmOWVkZWNhZjIyNDRj YS4uZTU0NGFjN2ZiZThiNWU2MGU3ZTdhNTBkYTBmMWZhY2RmYWNiOTkwNCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlz cGxheUNvbnRlbnRCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCkBAIC0x MjgsNyArMTI4LDggQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmFwcGVuZFRl eHREaXNwbGF5Qm94KGNvbnN0IExpbmU6OlJ1biYgbGluZVJ1biwKICAgICAgICAgLCBsaW5lUnVu LmV4cGFuc2lvbigpCiAgICAgICAgICwgSW5saW5lRGlzcGxheTo6Qm94OjpUZXh0IHsgdGV4dC0+ c3RhcnQsIHRleHQtPmxlbmd0aCwgY29udGVudCwgYWRqdXN0ZWRDb250ZW50VG9SZW5kZXIoKSwg dGV4dC0+bmVlZHNIeXBoZW4gfQogICAgICAgICAsIHRydWUKLSAgICAgICAgLCB7IH0gfSk7Cisg ICAgICAgICwgeyB9CisgICAgfSk7CiB9CiAKIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWls ZGVyOjphcHBlbmRTb2Z0TGluZUJyZWFrRGlzcGxheUJveChjb25zdCBMaW5lOjpSdW4mIGxpbmVS dW4sIGNvbnN0IElubGluZVJlY3QmIHNvZnRMaW5lQnJlYWtSdW5SZWN0LCBEaXNwbGF5Qm94ZXMm IGJveGVzKQpAQCAtMTQ1LDcgKzE0Niw4IEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWls ZGVyOjphcHBlbmRTb2Z0TGluZUJyZWFrRGlzcGxheUJveChjb25zdCBMaW5lOjpSdW4mCiAgICAg ICAgICwgc29mdExpbmVCcmVha1J1blJlY3QKICAgICAgICAgLCBzb2Z0TGluZUJyZWFrUnVuUmVj dAogICAgICAgICAsIGxpbmVSdW4uZXhwYW5zaW9uKCkKLSAgICAgICAgLCBJbmxpbmVEaXNwbGF5 OjpCb3g6OlRleHQgeyB0ZXh0LT5zdGFydCwgdGV4dC0+bGVuZ3RoLCBkb3duY2FzdDxJbmxpbmVU ZXh0Qm94PihsYXlvdXRCb3gpLmNvbnRlbnQoKSB9IH0pOworICAgICAgICAsIElubGluZURpc3Bs YXk6OkJveDo6VGV4dCB7IHRleHQtPnN0YXJ0LCB0ZXh0LT5sZW5ndGgsIGRvd25jYXN0PElubGlu ZVRleHRCb3g+KGxheW91dEJveCkuY29udGVudCgpIH0KKyAgICB9KTsKIH0KIAogdm9pZCBJbmxp bmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmFwcGVuZEhhcmRMaW5lQnJlYWtEaXNwbGF5Qm94KGNv bnN0IExpbmU6OlJ1biYgbGluZVJ1biwgY29uc3QgSW5saW5lUmVjdCYgbGluZUJyZWFrQm94UmVj dCwgRGlzcGxheUJveGVzJiBib3hlcykKQEAgLTE1OSw3ICsxNjEsOCBAQCB2b2lkIElubGluZURp c3BsYXlDb250ZW50QnVpbGRlcjo6YXBwZW5kSGFyZExpbmVCcmVha0Rpc3BsYXlCb3goY29uc3Qg TGluZTo6UnVuJgogICAgICAgICAsIGxpbmVCcmVha0JveFJlY3QKICAgICAgICAgLCBsaW5lQnJl YWtCb3hSZWN0CiAgICAgICAgICwgbGluZVJ1bi5leHBhbnNpb24oKQotICAgICAgICAsIHsgfSB9 KTsKKyAgICAgICAgLCB7IH0KKyAgICB9KTsKIAogICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9y bWF0dGluZ1N0YXRlKCkuYm94R2VvbWV0cnkobGF5b3V0Qm94KTsKICAgICBib3hHZW9tZXRyeS5z ZXRMb2dpY2FsVG9wTGVmdCh0b0xheW91dFBvaW50KGxpbmVCcmVha0JveFJlY3QudG9wTGVmdCgp KSk7CkBAIC0xODUsNyArMTg4LDggQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6 OmFwcGVuZEF0b21pY0lubGluZUxldmVsRGlzcGxheUJveChjb25zdCBMaW5lOjoKICAgICAgICAg LCBib3JkZXJCb3hSZWN0CiAgICAgICAgICwgaW5rT3ZlcmZsb3coKQogICAgICAgICAsIGxpbmVS dW4uZXhwYW5zaW9uKCkKLSAgICAgICAgLCB7IH0gfSk7CisgICAgICAgICwgeyB9CisgICAgfSk7 CiAgICAgLy8gTm90ZSB0aGF0IGlubGluZSBib3hlcyBhcmUgcmVsYXRpdmUgdG8gdGhlIGxpbmUg YW5kIHRoZWlyIHRvcCBwb3NpdGlvbiBjYW4gYmUgbmVnYXRpdmUuCiAgICAgLy8gQXRvbWljIGlu bGluZSBib3hlcyBhcmUgYWxsIHNldC4gVGhlaXIgbWFyZ2luL2JvcmRlci9jb250ZW50IGJveCBn ZW9tZXRyaWVzIGFyZSBhbHJlYWR5IGNvbXB1dGVkLiBXZSBqdXN0IGhhdmUgdG8gcG9zaXRpb24g dGhlbSBoZXJlLgogICAgIGZvcm1hdHRpbmdTdGF0ZSgpLmJveEdlb21ldHJ5KGxheW91dEJveCku c2V0TG9naWNhbFRvcExlZnQodG9MYXlvdXRQb2ludChib3JkZXJCb3hSZWN0LnRvcExlZnQoKSkp OwpAQCAtMjM2LDcgKzI0MCw4IEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjph cHBlbmRJbmxpbmVCb3hEaXNwbGF5Qm94KGNvbnN0IExpbmU6OlJ1biYgbGluCiAgICAgICAgICwg eyB9CiAgICAgICAgICwgeyB9CiAgICAgICAgICwgaW5saW5lQm94Lmhhc0NvbnRlbnQoKQotICAg ICAgICAsIGlzRmlyc3RMYXN0Qm94KGlubGluZUJveCkgfSk7CisgICAgICAgICwgaXNGaXJzdExh c3RCb3goaW5saW5lQm94KQorICAgIH0pOwogICAgIC8vIFRoaXMgaW5saW5lIGJveCBzaG93ZWQg dXAgZmlyc3Qgb24gdGhpcyBsaW5lLgogICAgIHNldElubGluZUJveEdlb21ldHJ5KGxheW91dEJv eCwgaW5saW5lQm94Qm9yZGVyQm94LCB0cnVlKTsKIH0KQEAgLTI2MSwxMSArMjY2LDI2IEBAIHZv aWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjphcHBlbmRTcGFubmluZ0lubGluZUJveERp c3BsYXlCb3goY29uc3QgTGluZTo6CiAgICAgICAgICwgeyB9CiAgICAgICAgICwgeyB9CiAgICAg ICAgICwgaW5saW5lQm94Lmhhc0NvbnRlbnQoKQotICAgICAgICAsIGlzRmlyc3RMYXN0Qm94KGlu bGluZUJveCkgfSk7CisgICAgICAgICwgaXNGaXJzdExhc3RCb3goaW5saW5lQm94KQorICAgIH0p OwogICAgIC8vIE1pZGRsZSBvciBlbmQgb2YgdGhlIGlubGluZSBib3guIExldCdzIHN0cmV0Y2gg dGhlIGJveCBhcyBuZWVkZWQuCiAgICAgc2V0SW5saW5lQm94R2VvbWV0cnkobGF5b3V0Qm94LCBp bmxpbmVCb3hCb3JkZXJCb3gsIGZhbHNlKTsKIH0KIAordm9pZCBJbmxpbmVEaXNwbGF5Q29udGVu dEJ1aWxkZXI6OmFwcGVuZElubGluZURpc3BsYXlCb3hBdEJpZGlCb3VuZGFyeShjb25zdCBCb3gm IGxheW91dEJveCwgRGlzcGxheUJveGVzJiBib3hlcykKK3sKKyAgICAvLyBHZW9tZXRyaWVzIGZv ciBpbmxpbmUgYm94ZXMgYXQgYmlkaSBib3VuZGFyaWVzIGFyZSBjb21wdXRlZCBhdCBhIHBvc3Qt cHJvY2VzcyBzdGVwLgorICAgIGJveGVzLmFwcGVuZCh7IG1fbGluZUluZGV4CisgICAgICAgICwg SW5saW5lRGlzcGxheTo6Qm94OjpUeXBlOjpOb25Sb290SW5saW5lQm94CisgICAgICAgICwgbGF5 b3V0Qm94CisgICAgICAgICwgVUJJRElfREVGQVVMVF9MVFIKKyAgICAgICAgLCB7IH0KKyAgICAg ICAgLCB7IH0KKyAgICAgICAgLCB7IH0KKyAgICAgICAgLCB7IH0KKyAgICB9KTsKK30KKwogdm9p ZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OnByb2Nlc3NOb25CaWRpQ29udGVudChjb25z dCBMaW5lQnVpbGRlcjo6TGluZUNvbnRlbnQmIGxpbmVDb250ZW50LCBjb25zdCBMaW5lQm94JiBs aW5lQm94LCBjb25zdCBJbmxpbmVMYXlvdXRQb2ludCYgbGluZUJveExvZ2ljYWxUb3BMZWZ0LCBE aXNwbGF5Qm94ZXMmIGJveGVzKQogewogICAgIC8vIENyZWF0ZSB0aGUgaW5saW5lIGJveGVzIG9u IHRoZSBjdXJyZW50IGxpbmUuIFRoaXMgaXMgbW9zdGx5IHRleHQgYW5kIGF0b21pYyBpbmxpbmUg Ym94ZXMuCkBAIC0zNzcsNyArMzk3LDcgQEAgRGlzcGxheUJveE5vZGUmIElubGluZURpc3BsYXlD b250ZW50QnVpbGRlcjo6ZW5zdXJlRGlzcGxheUJveEZvckNvbnRhaW5lcihjb25zdAogICAgIGlm IChhdXRvKiBsb3dlc3RDb21tb25BbmNlc3RvciA9IGFuY2VzdG9yU3RhY2sudW53aW5kKGNvbnRh aW5lckJveCkpCiAgICAgICAgIHJldHVybiAqbG93ZXN0Q29tbW9uQW5jZXN0b3I7CiAgICAgYXV0 byYgZW5jbG9zaW5nRGlzcGxheUJveE5vZGVGb3JDb250YWluZXIgPSBlbnN1cmVEaXNwbGF5Qm94 Rm9yQ29udGFpbmVyKGNvbnRhaW5lckJveC5wYXJlbnQoKSwgYW5jZXN0b3JTdGFjaywgYm94ZXMp OwotICAgIGJveGVzLmFwcGVuZCh7IG1fbGluZUluZGV4LCBJbmxpbmVEaXNwbGF5OjpCb3g6OlR5 cGU6Ok5vblJvb3RJbmxpbmVCb3gsIGNvbnRhaW5lckJveCwgVUJJRElfREVGQVVMVF9MVFIsIHsg fSwgeyB9LCB7IH0sIHsgfSwgdHJ1ZSwgeyB9IH0pOworICAgIGFwcGVuZElubGluZURpc3BsYXlC b3hBdEJpZGlCb3VuZGFyeShjb250YWluZXJCb3gsIGJveGVzKTsKICAgICByZXR1cm4gY3JlYXRl ZERpc3BsYXlCb3hOb2RlRm9yQ29udGFpbmVyQm94QW5kUHVzaFRvQW5jZXN0b3JTdGFjayhjb250 YWluZXJCb3gsIGJveGVzLnNpemUoKSAtIDEsIGVuY2xvc2luZ0Rpc3BsYXlCb3hOb2RlRm9yQ29u dGFpbmVyLCBhbmNlc3RvclN0YWNrKTsKIH0KIApAQCAtNDAzLDcgKzQyMyw2IEBAIHZvaWQgSW5s aW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjphZGp1c3RWaXN1YWxHZW9tZXRyeUZvckNoaWxkTm9k ZShjb25zdCBEaXNwbGF5CiAgICAgYXV0byBiZWZvcmVJbmxpbmVCb3hDb250ZW50ID0gWyZdIHsK ICAgICAgICAgYXV0byBsb2dpY2FsUmVjdCA9IGxpbmVCb3gubG9naWNhbEJvcmRlckJveEZvcklu bGluZUJveChsYXlvdXRCb3gsIGJveEdlb21ldHJ5KTsKICAgICAgICAgYXV0byB2aXN1YWxSZWN0 ID0gSW5saW5lUmVjdCB7IGxpbmVCb3hMb2dpY2FsVG9wICsgbG9naWNhbFJlY3QudG9wKCksIGNv bnRlbnRSaWdodEluVmlzdWFsT3JkZXIsIHsgfSwgbG9naWNhbFJlY3QuaGVpZ2h0KCkgfTsKLSAg ICAgICAgLy8gRklYTUU6IEFkZCBzdXBwb3J0IGZvciBpbmsgb3ZlcmZsb3cuCiAgICAgICAgIGlm ICghZGlzcGxheUJveC5pc0ZpcnN0Rm9yTGF5b3V0Qm94KCkpCiAgICAgICAgICAgICByZXR1cm4g ZGlzcGxheUJveC5zZXRMb2dpY2FsUmVjdCh2aXN1YWxSZWN0LCB2aXN1YWxSZWN0KTsKIApAQCAt NDI3LDYgKzQ0NiwxMyBAQCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6YWRqdXN0 VmlzdWFsR2VvbWV0cnlGb3JDaGlsZE5vZGUoY29uc3QgRGlzcGxheQogICAgIH07CiAgICAgYWZ0 ZXJJbmxpbmVCb3hDb250ZW50KCk7CiAKKyAgICBhdXRvIGNvbXB1dGVJbmtPdmVyZmxvdyA9IFsm XSB7CisgICAgICAgIGF1dG8gaW5rT3ZlcmZsb3cgPSBkaXNwbGF5Qm94LmxvZ2ljYWxSZWN0KCk7 CisgICAgICAgIG1fY29udGVudEhhc0lua092ZXJmbG93ID0gY29tcHV0ZUJveFNoYWRvd0lua092 ZXJmbG93KCFtX2xpbmVJbmRleCA/IGxheW91dEJveC5maXJzdExpbmVTdHlsZSgpIDogbGF5b3V0 Qm94LnN0eWxlKCksIGlua092ZXJmbG93KSB8fCBtX2NvbnRlbnRIYXNJbmtPdmVyZmxvdzsKKyAg ICAgICAgZGlzcGxheUJveC5hZGp1c3RJbmtPdmVyZmxvdyhpbmtPdmVyZmxvdyk7CisgICAgfTsK KyAgICBjb21wdXRlSW5rT3ZlcmZsb3coKTsKKwogICAgIHNldElubGluZUJveEdlb21ldHJ5KGxh eW91dEJveCwgZGlzcGxheUJveC5sb2dpY2FsUmVjdCgpLCBkaXNwbGF5Qm94LmlzRmlyc3RGb3JM YXlvdXRCb3goKSk7CiAgICAgaWYgKGxpbmVCb3guaW5saW5lTGV2ZWxCb3hGb3JMYXlvdXRCb3go bGF5b3V0Qm94KS5oYXNDb250ZW50KCkpCiAgICAgICAgIGRpc3BsYXlCb3guc2V0SGFzQ29udGVu dCgpOwpAQCAtNDk4LDcgKzUyNCw3IEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVy Ojpwcm9jZXNzQmlkaUNvbnRlbnQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250CiAgICAgICAg ICAgICAgICAgY29udGludWU7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBpZiAobGluZVJ1 bi5pc0lubGluZUJveFN0YXJ0KCkgfHwgbGluZVJ1bi5pc0xpbmVTcGFubmluZ0lubGluZUJveFN0 YXJ0KCkpIHsKLSAgICAgICAgICAgICAgICBib3hlcy5hcHBlbmQoeyBtX2xpbmVJbmRleCwgSW5s aW5lRGlzcGxheTo6Qm94OjpUeXBlOjpOb25Sb290SW5saW5lQm94LCBsYXlvdXRCb3gsIFVCSURJ X0RFRkFVTFRfTFRSLCB7IH0sIHsgfSwgeyB9LCB7IH0sIHRydWUsIHsgfSB9KTsKKyAgICAgICAg ICAgICAgICBhcHBlbmRJbmxpbmVEaXNwbGF5Qm94QXRCaWRpQm91bmRhcnkobGF5b3V0Qm94LCBi b3hlcyk7CiAgICAgICAgICAgICAgICAgY3JlYXRlZERpc3BsYXlCb3hOb2RlRm9yQ29udGFpbmVy Qm94QW5kUHVzaFRvQW5jZXN0b3JTdGFjayhkb3duY2FzdDxDb250YWluZXJCb3g+KGxheW91dEJv eCksIGJveGVzLnNpemUoKSAtIDEsIHBhcmVudERpc3BsYXlCb3hOb2RlLCBhbmNlc3RvclN0YWNr KTsKICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURp c3BsYXlDb250ZW50QnVpbGRlci5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdD b250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmgKaW5kZXggMjlkYjQx YjhjZWRjMzY2YzRmYTkwZjQ0ODk0MGRiMjY2NDk2NDZkOS4uYWY3MDI2NWIwNWVhYWI2Y2RiYzY3 YTY5NmM4MGI1NGE2ZGIzMmIwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmgKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l RGlzcGxheUNvbnRlbnRCdWlsZGVyLmgKQEAgLTU5LDYgKzU5LDcgQEAgcHJpdmF0ZToKICAgICB2 b2lkIGFwcGVuZEF0b21pY0lubGluZUxldmVsRGlzcGxheUJveChjb25zdCBMaW5lOjpSdW4mLCBj b25zdCBJbmxpbmVSZWN0JiAsIERpc3BsYXlCb3hlcyYpOwogICAgIHZvaWQgYXBwZW5kSW5saW5l Qm94RGlzcGxheUJveChjb25zdCBMaW5lOjpSdW4mLCBjb25zdCBJbmxpbmVMZXZlbEJveCYsIGNv bnN0IElubGluZVJlY3QmLCBib29sIGxpbmVoYXNDb250ZW50LCBEaXNwbGF5Qm94ZXMmKTsKICAg ICB2b2lkIGFwcGVuZFNwYW5uaW5nSW5saW5lQm94RGlzcGxheUJveChjb25zdCBMaW5lOjpSdW4m LCBjb25zdCBJbmxpbmVMZXZlbEJveCYsIGNvbnN0IElubGluZVJlY3QmLCBEaXNwbGF5Qm94ZXMm KTsKKyAgICB2b2lkIGFwcGVuZElubGluZURpc3BsYXlCb3hBdEJpZGlCb3VuZGFyeShjb25zdCBC b3gmLCBEaXNwbGF5Qm94ZXMmKTsKIAogICAgIHZvaWQgc2V0SW5saW5lQm94R2VvbWV0cnkoY29u c3QgQm94JiwgY29uc3QgSW5saW5lUmVjdCYsIGJvb2wgaXNGaXJzdElubGluZUJveEZyYWdtZW50 KTsKICAgICB2b2lkIGFkanVzdFZpc3VhbEdlb21ldHJ5Rm9yQ2hpbGROb2RlKGNvbnN0IERpc3Bs YXlCb3hOb2RlJiwgSW5saW5lTGF5b3V0VW5pdCYgYWNjdW11bGF0ZWRPZmZzZXQsIElubGluZUxh eW91dFVuaXQgbGluZUJveExvZ2ljYWxUb3AsIERpc3BsYXlCb3hlcyYsIGNvbnN0IExpbmVCb3gm KTsK