233736 2021-12-01 16:58:34 -0800 [LFC][IFC] Create display boxes for fragmented inline boxes on bidi boundaries 2021-12-02 19:02:20 -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 1819481 0 zalan 2021-12-01 16:58:34 -0800 ssia 1819812 1 445757 zalan 2021-12-02 11:39:14 -0800 Created attachment 445757 Patch 1819996 2 ews-feeder 2021-12-02 19:01:45 -0800 Committed r286475 (244814@main): <https://commits.webkit.org/244814@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 445757. 1819997 3 webkit-bug-importer 2021-12-02 19:02:20 -0800 <rdar://problem/85999576> 445757 2021-12-02 11:39:14 -0800 2021-12-02 19:01:46 -0800 Patch Patch.txt text/plain 9701 zalan Y29tbWl0IDk4NTJkODkwZDZkNTM4Yzc3ZDkzZmIyODc1MGRhNGI2ZTk4NjFmNTIKQXV0aG9yOiBa YWxhbiBCdWp0YXMgPHphbGFuQGFwcGxlLmNvbT4KRGF0ZTogICBXZWQgRGVjIDEgMTg6NTY6MTYg MjAyMSAtMDgwMAoKICAgIGNyZWF0ZURpc3BsYXlCb3hlc0luVmlzdWFsT3JkZXJGb3JJbmxpbmVC b3hlcwoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZwppbmRleCA2NTdkZjdmNjA5NWIuLmYyNDk2NDg1ZGUxMiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTEyLTAxICBBbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxl LmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIENyZWF0ZSBkaXNwbGF5IGJveGVzIGZvciBmcmFn bWVudGVkIGlubGluZSBib3hlcyBvbiBiaWRpIGJvdW5kYXJpZXMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzczNgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluIHRoaXMgcGF0Y2ggd2UgaW5zZXJ0IGlu bGluZSBib3ggdHlwZSBvZiBkaXNwbGF5IGJveGVzIGluLWJldHdlZW4gYmlkaSBkaXNwbGF5IGJv eGVzIGFzIG5lZWRlZC4KKyAgICAgICAgV2UgZG9uJ3QgeWV0IGNvbXB1dGUgdmlzdWFsIGdlb21l dHJ5IGFuZC9vciBvZmZzZXQgdGhlIHJlc3Qgb2YgdGhlIGNvbnRlbnQgd2l0aCB0aGUgaW5qZWN0 ZWQgbWFyZ2lucywgYm9yZGVycyBhbmQgcGFkZGluZy4gCisKKyAgICAgICAgKiBsYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6Omlu c2VydElubGluZUJveERpc3BsYXlCb3hGb3JCaWRpQm91bmRhcnkpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OnByb2Nlc3NCaWRpQ29udGVu dCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZURpc3BsYXlDb250ZW50QnVpbGRl cjo6YXBwZW5kSW5saW5lQm94RGlzcGxheUJveEZvckJpZGlCb3VuZGFyeSk6IERlbGV0ZWQuCisg ICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNv bnRlbnRCdWlsZGVyLmg6CisKIDIwMjEtMTItMDEgIEFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUu Y29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gSW50cm9kdWNlIGNyZWF0ZURpc3BsYXlCb3hlc0lu VmlzdWFsT3JkZXJGb3JDb250ZW50UnVucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lu bGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAKaW5kZXggOTBhMDNlM2JmMDc0Li4wNGRhNDE4 NjAyNjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNvbnRl bnRCdWlsZGVyLmNwcApAQCAtMzMsNiArMzMsNyBAQAogI2luY2x1ZGUgIkxheW91dEluaXRpYWxD b250YWluaW5nQmxvY2suaCIKICNpbmNsdWRlICJSdW50aW1lRW5hYmxlZEZlYXR1cmVzLmgiCiAj aW5jbHVkZSAiVGV4dFV0aWwuaCIKKyNpbmNsdWRlIDx3dGYvTGlzdEhhc2hTZXQuaD4KIAogbmFt ZXNwYWNlIFdlYkNvcmUgewogbmFtZXNwYWNlIExheW91dCB7CkBAIC0yNjksMTEgKzI3MCwyMCBA QCB2b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6YXBwZW5kU3Bhbm5pbmdJbmxpbmVC b3hEaXNwbGF5Qm94KGNvbnN0IExpbmU6OgogICAgIHNldElubGluZUJveEdlb21ldHJ5KGxheW91 dEJveCwgaW5saW5lQm94Qm9yZGVyQm94LCBmYWxzZSk7CiB9CiAKLXZvaWQgSW5saW5lRGlzcGxh eUNvbnRlbnRCdWlsZGVyOjphcHBlbmRJbmxpbmVCb3hEaXNwbGF5Qm94Rm9yQmlkaUJvdW5kYXJ5 KGNvbnN0IEJveCYgbGF5b3V0Qm94LCBjb25zdCBJbmxpbmVSZWN0JiBpbmxpbmVCb3hSZWN0LCBE aXNwbGF5Qm94ZXMmIGJveGVzKQordm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6Omlu c2VydElubGluZUJveERpc3BsYXlCb3hGb3JCaWRpQm91bmRhcnkoY29uc3QgSW5saW5lTGV2ZWxC b3gmIGlubGluZUJveCwgY29uc3QgSW5saW5lUmVjdCYgaW5saW5lQm94UmVjdCwgc2l6ZV90IGlu c2VydGlvblBvaW50LCBEaXNwbGF5Qm94ZXMmIGJveGVzKQogewotICAgIFVOVVNFRF9QQVJBTShs YXlvdXRCb3gpOwotICAgIFVOVVNFRF9QQVJBTShpbmxpbmVCb3hSZWN0KTsKLSAgICBVTlVTRURf UEFSQU0oYm94ZXMpOworICAgIEFTU0VSVChpbmxpbmVCb3guaXNJbmxpbmVCb3goKSk7CisgICAg Ly8gRklYTUU6IENvbXB1dGUgaW5rIG92ZXJmbG93LgorICAgIGJveGVzLmluc2VydChpbnNlcnRp b25Qb2ludCwgeyBtX2xpbmVJbmRleAorICAgICAgICAsIElubGluZURpc3BsYXk6OkJveDo6VHlw ZTo6Tm9uUm9vdElubGluZUJveAorICAgICAgICAsIGlubGluZUJveC5sYXlvdXRCb3goKQorICAg ICAgICAsIFVCSURJX0RFRkFVTFRfTFRSCisgICAgICAgICwgaW5saW5lQm94UmVjdAorICAgICAg ICAsIGlubGluZUJveFJlY3QKKyAgICAgICAgLCB7IH0KKyAgICAgICAgLCB7IH0KKyAgICAgICAg LCB0cnVlCisgICAgICAgICwgaXNGaXJzdExhc3RCb3goaW5saW5lQm94KSB9KTsKIH0KIAogdm9p ZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OmFkanVzdElubGluZUJveERpc3BsYXlCb3hG b3JCaWRpQm91bmRhcnkoSW5saW5lRGlzcGxheTo6Qm94JiBkaXNwbGF5Qm94LCBjb25zdCBJbmxp bmVSZWN0JiBpbmxpbmVCb3hSZWN0KQpAQCAtMzQwLDYgKzM1MCw3IEBAIHZvaWQgSW5saW5lRGlz cGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzQmlkaUNvbnRlbnQoY29uc3QgTGluZUJ1aWxkZXI6 OkxpbmVDb250CiB7CiAgICAgQVNTRVJUKGxpbmVDb250ZW50LnZpc3VhbE9yZGVyTGlzdC5zaXpl KCkgPT0gbGluZUNvbnRlbnQucnVucy5zaXplKCkpOwogCisgICAgYXV0byBuZWVkc05vblJvb3RJ bmxpbmVCb3hEaXNwbGF5Qm94ID0gZmFsc2U7CiAgICAgYXV0byBjcmVhdGVEaXNwbGF5Qm94ZXNJ blZpc3VhbE9yZGVyRm9yQ29udGVudFJ1bnMgPSBbJl0gewogICAgICAgICBhdXRvIHJvb3RJbmxp bmVCb3hSZWN0ID0gbGluZUJveC5sb2dpY2FsUmVjdEZvclJvb3RJbmxpbmVCb3goKTsKICAgICAg ICAgYXV0byBjb250ZW50UmlnaHRJblZpc3VhbE9yZGVyID0gSW5saW5lTGF5b3V0VW5pdCB7IH07 CkBAIC0zNTgsNyArMzY5LDcgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OnBy b2Nlc3NCaWRpQ29udGVudChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnQKIAogICAgICAgICAg ICAgYXV0byBpc0NvbnRlbnRSdW4gPSAhbGluZVJ1bi5pc0lubGluZUJveFN0YXJ0KCkgJiYgIWxp bmVSdW4uaXNMaW5lU3Bhbm5pbmdJbmxpbmVCb3hTdGFydCgpICYmICFsaW5lUnVuLmlzSW5saW5l Qm94RW5kKCk7CiAgICAgICAgICAgICBpZiAoIWlzQ29udGVudFJ1bikgewotICAgICAgICAgICAg ICAgIC8vIEZJWE1FOiBBZGQgc3VwcG9ydCBmb3IgaW5saW5lIGJveGVzLgorICAgICAgICAgICAg ICAgIG5lZWRzTm9uUm9vdElubGluZUJveERpc3BsYXlCb3ggPSB0cnVlOwogICAgICAgICAgICAg ICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgfQogCkBAIC0zOTcsNiArNDA4LDc2IEBAIHZvaWQg SW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzQmlkaUNvbnRlbnQoY29uc3QgTGlu ZUJ1aWxkZXI6OkxpbmVDb250CiAgICAgICAgIH0KICAgICB9OwogICAgIGNyZWF0ZURpc3BsYXlC b3hlc0luVmlzdWFsT3JkZXJGb3JDb250ZW50UnVucygpOworCisgICAgYXV0byBjcmVhdGVEaXNw bGF5Qm94ZXNJblZpc3VhbE9yZGVyRm9ySW5saW5lQm94ZXMgPSBbJl0geworICAgICAgICAvLyBW aXN1YWwgb3JkZXIgY291bGQgaW50cm9kdWNlIGdhcHMgYW5kL29yIGluamVjdCBydW5zIG91dHNp ZGUgZnJvbSB0aGUgY3VycmVudCBpbmxpbmUgYm94IGNvbnRlbnQuCisgICAgICAgIC8vIEluIHN1 Y2ggY2FzZXMsIHdlIG5lZWQgdG8gImNsb3NlIiBhbmQgIm9wZW4iIGRpc3BsYXkgYm94ZXMgZm9y IHRoZXNlIGlubGluZSBib3ggZnJhZ21lbnRzCisgICAgICAgIC8vIHRvIGFjY29tbW9kYXRlIHRo ZSBjdXJyZW50IGNvbnRlbnQuCisgICAgICAgIC8vIFdlIGRvIGl0IGJ5IGZpbmRpbmcgdGhlIGxv d2VzdCBjb21tb24gYW5jZXN0b3Igb2YgdGhlIGxhc3QgYW5kIHRoZSBjdXJyZW50IGNvbnRlbnQg ZGlzcGxheSBib3hlcyBhbmQKKyAgICAgICAgLy8gdHJhdmVyc2UgYm90aCBhbmNlc3RvciBjaGFp bnMgYW5kIGNsb3NlL29wZW4gdGhlIHBhcmVudCAoaW5saW5lKSBib3hlcy4KKyAgICAgICAgLy8g KG9wZW4gaGVyZSBtZWFucyB0byBjcmVhdGUgYSBuZXcgZGlzcGxheSBib3gsIHdoaWxlIGNsb3Nl IG1lYW5zIHRvIHNpbXBseSBwb3AgaXQgb3V0IG9mIHBhcmVudEJveFN0YWNrKS4KKyAgICAgICAg Ly8gPGRpdj5hPHNwYW4gaWQ9Zmlyc3Q+YiYjODIzODtnPC9zcGFuPmY8c3BhbiBpZD1zZWNvbmQ+ ZSYjODIzNztjPC9zcGFuPmQ8L2Rpdj4KKyAgICAgICAgLy8gcHJvZHVjZXMgdGhlIGZvbGxvd2lu ZyBvdXRwdXQgKG5vdGUgdGhlICM4MjM4OyAjODIzNzsgUlRML0xUUiBjb250cm9sIGNoYXJhY3Rl cnMpOgorICAgICAgICAvLyBhYmNkZWZnCisgICAgICAgIC8vIHdpdGggdGhlIGZvbGxvd2luZywg ZnJhZ21lbnRlZCBpbmxpbmUgYm94ZXM6CisgICAgICAgIC8vIGFbZmlyc3Qgb3Blbl1iW2ZpcnN0 IGNsb3NlXVtzZWNvbmQgb3Blbl1jW3NlY29uZCBjbG9zZV1kW3NlY29uZCBvcGVuXWVbc2Vjb25k IGNsb3NlXWZbZmlyc3Qgb3Blbl1nW2ZpcnN0IGNsb3NlXQorICAgICAgICBMaXN0SGFzaFNldDxj b25zdCBCb3gqPiBwYXJlbnRCb3hTdGFjazsKKyAgICAgICAgcGFyZW50Qm94U3RhY2suYWRkKCZy b290KCkpOworCisgICAgICAgIEFTU0VSVChib3hlc1swXS5pc1Jvb3RJbmxpbmVCb3goKSk7Cisg ICAgICAgIGZvciAoc2l6ZV90IGluZGV4ID0gMTsgaW5kZXggPCBib3hlcy5zaXplKCk7ICsraW5k ZXgpIHsKKyAgICAgICAgICAgIGF1dG8mIHBhcmVudEJveCA9IGJveGVzW2luZGV4XS5sYXlvdXRC b3goKS5wYXJlbnQoKTsKKyAgICAgICAgICAgIEFTU0VSVChwYXJlbnRCb3guaXNJbmxpbmVCb3go KSB8fCAmcGFyZW50Qm94ID09ICZyb290KCkpOworCisgICAgICAgICAgICBhdXRvIHJ1blBhcmVu dElzQ3VycmVudElubGluZUJveCA9ICZwYXJlbnRCb3ggPT0gcGFyZW50Qm94U3RhY2subGFzdCgp OworICAgICAgICAgICAgaWYgKHJ1blBhcmVudElzQ3VycmVudElubGluZUJveCkgeworICAgICAg ICAgICAgICAgIC8vIFdlJ3ZlIGdvdCB0aGUgY29ycmVjdCBpbmxpbmUgYm94IGFzIHBhcmVudC4g Tm90aGluZyB0byBkbyBoZXJlLgorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAg ICAgfQorICAgICAgICAgICAgYXV0byBwYXJlbnRCb3hTdGFja0VuZCA9IHBhcmVudEJveFN0YWNr LmVuZCgpOworICAgICAgICAgICAgVmVjdG9yPGNvbnN0IEJveCo+IGlubGluZUJveE5lZWRpbmdE aXNwbGF5Qm94TGlzdDsKKyAgICAgICAgICAgIGZvciAoYXV0byogYW5jZXN0b3IgPSAmcGFyZW50 Qm94OyBhbmNlc3RvcjsgYW5jZXN0b3IgPSAmYW5jZXN0b3ItPnBhcmVudCgpKSB7CisgICAgICAg ICAgICAgICAgQVNTRVJUKGFuY2VzdG9yID09ICZyb290KCkgfHwgYW5jZXN0b3ItPmlzSW5saW5l Qm94KCkpOworICAgICAgICAgICAgICAgIGF1dG8gcGFyZW50Qm94SXRlcmF0b3IgPSBwYXJlbnRC b3hTdGFjay5maW5kKGFuY2VzdG9yKTsKKyAgICAgICAgICAgICAgICBpZiAocGFyZW50Qm94SXRl cmF0b3IgIT0gcGFyZW50Qm94U3RhY2tFbmQpIHsKKyAgICAgICAgICAgICAgICAgICAgLy8gVGhp cyBpcyB0aGUgbG93ZXN0IGNvbW1vbiBhbmNlc3Rvci4KKyAgICAgICAgICAgICAgICAgICAgLy8g TGV0J3MgdHJhdmVyc2UgYm90aCBhbmNlc3RvciBjaGFpbnMgYW5kIGNyZWF0ZS9jbG9zZSBkaXNw bGF5IGJveGVzIGFzIG5lZWRlZC4KKyAgICAgICAgICAgICAgICAgICAgVmVjdG9yPGNvbnN0IEJv eCo+IGlubGluZUJveEZyYWdtZW50c1RvQ2xvc2U7CisgICAgICAgICAgICAgICAgICAgIGZvciAo YXV0byBpdCA9ICsrcGFyZW50Qm94SXRlcmF0b3I7IGl0ICE9IHBhcmVudEJveFN0YWNrRW5kOyAr K2l0KQorICAgICAgICAgICAgICAgICAgICAgICAgaW5saW5lQm94RnJhZ21lbnRzVG9DbG9zZS5h cHBlbmQoKml0KTsKKworICAgICAgICAgICAgICAgICAgICBmb3IgKGF1dG8qIGlubGluZUJveCA6 IG1ha2VSZXZlcnNlZFJhbmdlKGlubGluZUJveEZyYWdtZW50c1RvQ2xvc2UpKSB7CisgICAgICAg ICAgICAgICAgICAgICAgICBBU1NFUlQoaW5saW5lQm94LT5pc0lubGluZUJveCgpKTsKKyAgICAg ICAgICAgICAgICAgICAgICAgIHBhcmVudEJveFN0YWNrLnJlbW92ZShpbmxpbmVCb3gpOworICAg ICAgICAgICAgICAgICAgICB9CisKKyAgICAgICAgICAgICAgICAgICAgLy8gSW5zZXJ0IG5ldyBk aXNwbGF5IGJveGVzIGZvciBpbmxpbmUgYm94IGZyYWdtZW50cyBvbiBiaWRpIGJvdW5kYXJ5Lgor ICAgICAgICAgICAgICAgICAgICBmb3IgKGF1dG8qIGlubGluZUJveCA6IG1ha2VSZXZlcnNlZFJh bmdlKGlubGluZUJveE5lZWRpbmdEaXNwbGF5Qm94TGlzdCkpIHsKKyAgICAgICAgICAgICAgICAg ICAgICAgIEFTU0VSVChpbmxpbmVCb3gtPmlzSW5saW5lQm94KCkpOworICAgICAgICAgICAgICAg ICAgICAgICAgcGFyZW50Qm94U3RhY2suYWRkKGlubGluZUJveCk7CisKKyAgICAgICAgICAgICAg ICAgICAgICAgIGF1dG8gY3JlYXRlQW5kSW5zZXJ0RGlzcGxheUJveEZvcklubGluZUJveEZyYWdt ZW50ID0gWyZdIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBhdXRvIHZpc3VhbFJlY3Qg PSBsaW5lQm94LmxvZ2ljYWxCb3JkZXJCb3hGb3JJbmxpbmVCb3goKmlubGluZUJveCwgZm9ybWF0 dGluZ1N0YXRlKCkuYm94R2VvbWV0cnkoKmlubGluZUJveCkpOworICAgICAgICAgICAgICAgICAg ICAgICAgICAgIC8vIFVzZSB0aGUgY3VycmVudCBjb250ZW50IGxlZnQgYXMgdGhlIHN0YXJ0aW5n IHBvaW50IGZvciB0aGlzIGRpc3BsYXkgYm94LgorICAgICAgICAgICAgICAgICAgICAgICAgICAg IHZpc3VhbFJlY3Quc2V0TGVmdChib3hlc1tpbmRleF0ubG9naWNhbExlZnQoKSk7CisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgdmlzdWFsUmVjdC5tb3ZlVmVydGljYWxseShsaW5lQm94TG9n aWNhbFRvcExlZnQueSgpKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAvLyBWaXN1YWwg d2lkdGggaXMgbm90IHlldCBrbm93bi4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICB2aXN1 YWxSZWN0LnNldFdpZHRoKHsgfSk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5zZXJ0 SW5saW5lQm94RGlzcGxheUJveEZvckJpZGlCb3VuZGFyeShsaW5lQm94LmlubGluZUxldmVsQm94 Rm9yTGF5b3V0Qm94KCppbmxpbmVCb3gpLCB2aXN1YWxSZWN0LCBpbmRleCwgYm94ZXMpOworICAg ICAgICAgICAgICAgICAgICAgICAgICAgICsraW5kZXg7CisgICAgICAgICAgICAgICAgICAgICAg ICB9OworICAgICAgICAgICAgICAgICAgICAgICAgY3JlYXRlQW5kSW5zZXJ0RGlzcGxheUJveEZv cklubGluZUJveEZyYWdtZW50KCk7CisgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAg ICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIC8vIHJv b3QgbWF5IG5vdCBiZSB0aGUgbG93ZXN0IGJ1dCBhbHdheXMgYSBjb21tb24gYW5jZXN0b3IuCisg ICAgICAgICAgICAgICAgQVNTRVJUKGFuY2VzdG9yICE9ICZyb290KCkpOworICAgICAgICAgICAg ICAgIGlubGluZUJveE5lZWRpbmdEaXNwbGF5Qm94TGlzdC5hcHBlbmQoYW5jZXN0b3IpOworICAg ICAgICAgICAgfQorICAgICAgICB9CisgICAgfTsKKyAgICBpZiAobmVlZHNOb25Sb290SW5saW5l Qm94RGlzcGxheUJveCkKKyAgICAgICAgY3JlYXRlRGlzcGxheUJveGVzSW5WaXN1YWxPcmRlckZv cklubGluZUJveGVzKCk7CiB9CiAKIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpw cm9jZXNzT3ZlcmZsb3duUnVuc0ZvckVsbGlwc2lzKERpc3BsYXlCb3hlcyYgYm94ZXMsIElubGlu ZUxheW91dFVuaXQgbGluZUJveExvZ2ljYWxSaWdodCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50 QnVpbGRlci5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxp bmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmgKaW5kZXggZDdhM2IzNGM4ZWFjLi5mZmJm M2EyMjAwODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29u dGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVpbGRlci5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250 ZW50QnVpbGRlci5oCkBAIC01NSw3ICs1NSw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBhcHBlbmRB dG9taWNJbmxpbmVMZXZlbERpc3BsYXlCb3goY29uc3QgTGluZTo6UnVuJiwgY29uc3QgSW5saW5l UmVjdCYgLCBEaXNwbGF5Qm94ZXMmKTsKICAgICB2b2lkIGFwcGVuZElubGluZUJveERpc3BsYXlC b3goY29uc3QgTGluZTo6UnVuJiwgY29uc3QgSW5saW5lTGV2ZWxCb3gmLCBjb25zdCBJbmxpbmVS ZWN0JiwgYm9vbCBsaW5laGFzQ29udGVudCwgRGlzcGxheUJveGVzJik7CiAgICAgdm9pZCBhcHBl bmRTcGFubmluZ0lubGluZUJveERpc3BsYXlCb3goY29uc3QgTGluZTo6UnVuJiwgY29uc3QgSW5s aW5lTGV2ZWxCb3gmLCBjb25zdCBJbmxpbmVSZWN0JiwgRGlzcGxheUJveGVzJik7Ci0gICAgdm9p ZCBhcHBlbmRJbmxpbmVCb3hEaXNwbGF5Qm94Rm9yQmlkaUJvdW5kYXJ5KGNvbnN0IEJveCYsIGNv bnN0IElubGluZVJlY3QmLCBEaXNwbGF5Qm94ZXMmKTsKKyAgICB2b2lkIGluc2VydElubGluZUJv eERpc3BsYXlCb3hGb3JCaWRpQm91bmRhcnkoY29uc3QgSW5saW5lTGV2ZWxCb3gmLCBjb25zdCBJ bmxpbmVSZWN0Jiwgc2l6ZV90IGluc2VydGlvblBvaW50LCBEaXNwbGF5Qm94ZXMmKTsKICAgICB2 b2lkIGFkanVzdElubGluZUJveERpc3BsYXlCb3hGb3JCaWRpQm91bmRhcnkoSW5saW5lRGlzcGxh eTo6Qm94JiwgY29uc3QgSW5saW5lUmVjdCYpOwogCiAgICAgdm9pZCBzZXRJbmxpbmVCb3hHZW9t ZXRyeShjb25zdCBCb3gmLCBjb25zdCBJbmxpbmVSZWN0JiwgYm9vbCBpc0ZpcnN0SW5saW5lQm94 RnJhZ21lbnQpOwo=