233588 2021-11-29 12:42:00 -0800 [LFC][IFC] Compute visual geometry for bidi content including fragmented inline boxes 2021-12-01 16:02:18 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED INVALID P2 Normal --- 1 zalan zalan bfulgham simon.fraser zalan oldest_to_newest 1818412 0 zalan 2021-11-29 12:42:00 -0800 ssia 1818423 1 445327 zalan 2021-11-29 12:58:33 -0800 Created attachment 445327 Patch 445327 2021-11-29 12:58:33 -0800 2021-11-29 12:58:33 -0800 Patch bug-233588-20211129125832.patch text/plain 13290 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2MTIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDViZWEzZDcxNGM1MmM4 M2M4MDVjZDgyMDY0MmExODk1N2ZjYzg5Yy4uMTg0MTA1YzQ2OTJhZDJkZDdmYWZlZjc1ZGI2NTBk YTFjOGU4M2U3MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIxLTExLTI5ICBBbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXVtJRkNdIENvbXB1dGUg dmlzdWFsIGdlb21ldHJ5IGZvciBiaWRpIGNvbnRlbnQgaW5jbHVkaW5nIGZyYWdtZW50ZWQgaW5s aW5lIGJveGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMzM1ODgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBJbiB0aGlzIHBhdGNoIHdlIGRlY291cGxlCisgICAgICAgIDEuIHRoZSBkaXNwbGF5IGJveCBj cmVhdGlvbiBpbiB2aXN1YWwgb3JkZXIgKGluY2x1ZGluZyBmcmFnbWVudGVkIGlubGluZSBib3hl cykgYW5kCisgICAgICAgIDIuIGZpbmFsaXppbmcgZGlzcGxheSBib3hlcyBnZW9tZXRyaWVzLgor ICAgICAgICBJbiBtYW55IGNhc2VzIHdoZW4gdGhlIGlubGluZSBib3ggZ2V0cyBmcmFnbWVudGVk LCB3ZSBkb24ndCBrbm93IHdoZXRoZXIgdGhlIGRpc3BsYXkgYm94IGZvciBhIGdpdmVuCisgICAg ICAgIGlubGluZSBib3ggaXMgdGhlIGxhc3Qgb25lIGFuZCB3aGV0aGVyIHdlIHNob3VsZCBhZHZh bmNlIHRoZSBjb250ZW50IGJ5IHRoZSBlbmQgZ2VvbWV0cnkgdmFsdWVzIChwYWRkaW5nLCBib3Jk ZXIsIG1hcmdpbikuCisgICAgICAgIFRoaXMgcGF0Y2ggYWRkcmVzc2VzIGl0IGJ5IGluaXRpYXRp bmcgYSBzZWNvbmQgaXRlcmF0aW9uIG92ZXIgdGhlIG5ld2x5IGNvbnN0cnVjdGVkIGRpc3BsYXkg Ym94ZXMgYW5kCisgICAgICAgIGFkdmFuY2UgdGhlIGNvbnRlbnQgcG9zaXRpb24gYWNjb3JkaW5n IHRvIHRoZSBpc0ZpcnN0Qm94L2lzTGFzdEJveCBiaXRzIG9uIHRoZSBpbmxpbmUgYm94ZXMuCisK KyAgICAgICAgKiBsYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5 Q29udGVudEJ1aWxkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVEaXNw bGF5Q29udGVudEJ1aWxkZXI6OmFwcGVuZElubGluZUJveERpc3BsYXlCb3hGb3JCaWRpQm91bmRh cnkpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxk ZXI6OnByb2Nlc3NCaWRpQ29udGVudCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGlu ZURpc3BsYXlDb250ZW50QnVpbGRlcjo6YWRqdXN0SW5saW5lQm94RGlzcGxheUJveEZvckJpZGlC b3VuZGFyeSk6IERlbGV0ZWQuCisgICAgICAgICogbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyLmg6CisgICAgICAgICogbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlzcGxheS9JbmxpbmVEaXNwbGF5Qm94Lmg6CisgICAg ICAgIChXZWJDb3JlOjpJbmxpbmVEaXNwbGF5OjpCb3g6OnNldExvZ2ljYWxMZWZ0KToKKyAgICAg ICAgKFdlYkNvcmU6OklubGluZURpc3BsYXk6OkJveDo6c2V0TG9naWNhbFJpZ2h0KToKKwogMjAy MS0xMS0yOSAgQWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11b SUZDXSBDb21wdXRlIHRoZSBpc0ZpcnN0Qm94L2lzTGFzdEJveCBiaXQgZm9yIGlubGluZSBib3gg dHlwZSBvZiBkaXNwbGF5IGJveGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l RGlzcGxheUNvbnRlbnRCdWlsZGVyLmNwcAppbmRleCAxNGRlZWQ4ODZmNGVhNmY3Y2QxMDkzYTQ0 Y2NhNzhlYzBjOGJiYzEzLi4xYWYyZmFkODg0MjZkMDAwMmEyZGIxNjFlMGYzNzcyMzhjOWExNTE4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lu bGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZURpc3BsYXlDb250ZW50QnVp bGRlci5jcHAKQEAgLTI2OSwxNiArMjY5LDIyIEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRC dWlsZGVyOjphcHBlbmRTcGFubmluZ0lubGluZUJveERpc3BsYXlCb3goY29uc3QgTGluZTo6CiAK IHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjphcHBlbmRJbmxpbmVCb3hEaXNwbGF5 Qm94Rm9yQmlkaUJvdW5kYXJ5KGNvbnN0IEJveCYgbGF5b3V0Qm94LCBjb25zdCBJbmxpbmVSZWN0 JiBpbmxpbmVCb3hSZWN0LCBib29sIGlzRmlyc3RJbmxpbmVCb3hGcmFnbWVudCwgRGlzcGxheUJv eGVzJiBib3hlcykKIHsKLSAgICBVTlVTRURfUEFSQU0obGF5b3V0Qm94KTsKLSAgICBVTlVTRURf UEFSQU0oaW5saW5lQm94UmVjdCk7Ci0gICAgVU5VU0VEX1BBUkFNKGlzRmlyc3RJbmxpbmVCb3hG cmFnbWVudCk7Ci0gICAgVU5VU0VEX1BBUkFNKGJveGVzKTsKLX0KKyAgICBBU1NFUlQobGF5b3V0 Qm94LmlzSW5saW5lQm94KCkpOwogCi12b2lkIElubGluZURpc3BsYXlDb250ZW50QnVpbGRlcjo6 YWRqdXN0SW5saW5lQm94RGlzcGxheUJveEZvckJpZGlCb3VuZGFyeShJbmxpbmVEaXNwbGF5OjpC b3gmIGRpc3BsYXlCb3gsIGNvbnN0IElubGluZVJlY3QmIGlubGluZUJveFJlY3QpCi17Ci0gICAg VU5VU0VEX1BBUkFNKGRpc3BsYXlCb3gpOwotICAgIFVOVVNFRF9QQVJBTShpbmxpbmVCb3hSZWN0 KTsKKyAgICBhdXRvIGlzRmlyc3RsYXN0Qm94ID0gT3B0aW9uU2V0PElubGluZURpc3BsYXk6OkJv eDo6UG9zaXRpb25XaXRoaW5JbmxpbmVMZXZlbEJveD4geyBJbmxpbmVEaXNwbGF5OjpCb3g6OlBv c2l0aW9uV2l0aGluSW5saW5lTGV2ZWxCb3g6Okxhc3QgfTsKKyAgICBpZiAoaXNGaXJzdElubGlu ZUJveEZyYWdtZW50KQorICAgICAgICBpc0ZpcnN0bGFzdEJveC5hZGQoeyBJbmxpbmVEaXNwbGF5 OjpCb3g6OlBvc2l0aW9uV2l0aGluSW5saW5lTGV2ZWxCb3g6OkZpcnN0IH0pOworICAgIC8vIEZJ WE1FOiBDb21wdXRlIGluayBvdmVyZmxvdy4KKyAgICBib3hlcy5hcHBlbmQoeyBtX2xpbmVJbmRl eAorICAgICAgICAsIElubGluZURpc3BsYXk6OkJveDo6VHlwZTo6Tm9uUm9vdElubGluZUJveAor ICAgICAgICAsIGxheW91dEJveAorICAgICAgICAsIFVCSURJX0RFRkFVTFRfTFRSCisgICAgICAg ICwgaW5saW5lQm94UmVjdAorICAgICAgICAsIGlubGluZUJveFJlY3QKKyAgICAgICAgLCB7IH0K KyAgICAgICAgLCB7IH0KKyAgICAgICAgLCB0cnVlCisgICAgICAgICwgaXNGaXJzdGxhc3RCb3gg fSk7CiB9CiAKIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzTm9uQmlk aUNvbnRlbnQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50JiBsaW5lQ29udGVudCwgY29u c3QgTGluZUJveCYgbGluZUJveCwgY29uc3QgSW5saW5lTGF5b3V0UG9pbnQmIGxpbmVCb3hMb2dp Y2FsVG9wTGVmdCwgIERpc3BsYXlCb3hlcyYgYm94ZXMpCkBAIC0zODQsMTQgKzM5MCw3IEBAIHZv aWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWlsZGVyOjpwcm9jZXNzQmlkaUNvbnRlbnQoY29uc3Qg TGluZUJ1aWxkZXI6OkxpbmVDb250CiAgICAgICAgICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVB Q0hFRCgpOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgbG9naWNhbFJlY3QubW92ZVZlcnRp Y2FsbHkobGluZUJveExvZ2ljYWxUb3BMZWZ0LnkoKSk7Ci0gICAgICAgICAgICAvLyBVc2UgdGhl IGRpc3RhbmNlIGZyb20gdGhlIGxvZ2ljYWwgcHJldmlvdXMgcnVuIHRvIHBsYWNlIHRoZSBkaXNw bGF5IGJveCBob3Jpem9udGFsbHkgaW4gdmlzdWFsIHRlcm1zLgotICAgICAgICAgICAgYXV0byog bG9naWNhbFByZXZpb3VzUnVuID0gdmlzdWFsSW5kZXggPyAmcnVuc1t2aXN1YWxJbmRleCAtIDFd IDogbnVsbHB0cjsKLSAgICAgICAgICAgIC8vIENlcnRhaW4gY3NzIHByb3BlcnRpZXMgKGUuZy4g d29yZC1zcGFjaW5nKSBtYXkgaW50cm9kdWNlIGEgZ2FwIGJldHdlZW4gcnVucy4KLSAgICAgICAg ICAgIGF1dG8gZGlzdGFuY2VGcm9tTG9naWNhbFByZXZpb3VzUnVuID0gbG9naWNhbFByZXZpb3Vz UnVuID8gbGluZVJ1bi5sb2dpY2FsTGVmdCgpIC0gbG9naWNhbFByZXZpb3VzUnVuLT5sb2dpY2Fs UmlnaHQoKSA6IGxpbmVSdW4ubG9naWNhbExlZnQoKTsKLSAgICAgICAgICAgIGF1dG8gdmlzdWFs T3JkZXJSZWN0ID0gbG9naWNhbFJlY3Q7Ci0gICAgICAgICAgICBhdXRvIGNvbnRlbnRMZWZ0ID0g Y29udGVudFJpZ2h0SW5WaXN1YWxPcmRlciArIGRpc3RhbmNlRnJvbUxvZ2ljYWxQcmV2aW91c1J1 biArIG1hcmdpblN0YXJ0LnZhbHVlX29yKDApOwotICAgICAgICAgICAgdmlzdWFsT3JkZXJSZWN0 LnNldExlZnQoY29udGVudExlZnQpOwotICAgICAgICAgICAgcmV0dXJuIHZpc3VhbE9yZGVyUmVj dDsKKyAgICAgICAgICAgIHJldHVybiBsb2dpY2FsUmVjdDsKICAgICAgICAgfSgpOwogCiAgICAg ICAgIGF1dG8gaGFuZGxlSW5saW5lQm94Qm91bmRhcmllc0lmQXBwbGljYWJsZSA9IFsmXSB7CkBA IC00MTgsOCArNDE3LDYgQEAgdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OnByb2Nl c3NCaWRpQ29udGVudChjb25zdCBMaW5lQnVpbGRlcjo6TGluZUNvbnQKICAgICAgICAgICAgICAg ICBpZiAoJnBhcmVudEJveCA9PSAmaW5saW5lQm94RGlzcGxheUJveC5sYXlvdXRCb3goKSkKICAg ICAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAgaW5saW5lQm94U3RhY2su cmVtb3ZlTGFzdCgpOwotICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBDb21wdXRlIGdlb21ldHJ5 IGZvciB0aGlzIGlubGluZSBib3ggZnJhZ21lbnQuCi0gICAgICAgICAgICAgICAgYWRqdXN0SW5s aW5lQm94RGlzcGxheUJveEZvckJpZGlCb3VuZGFyeShpbmxpbmVCb3hEaXNwbGF5Qm94LCB7IH0p OwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICAvLyBXZSBhbHNvIG1heSBuZWVkIHRvICJv cGVuIiBuZXcgaW5saW5lIGJveGVzIGlmIHRoZSBjdXJyZW50IGNvbnRlbnQgaXMgbmVzdGVkIGlu c2lkZSBpbmxpbmUgYm94ZXMgKGUuZy4gc2VlIHRoZSBleGFtcGxlIGFib3ZlOyByaWdodCBiZWZv cmUgImciKQpAQCAtNDMyLDggKzQyOSw4IEBAIHZvaWQgSW5saW5lRGlzcGxheUNvbnRlbnRCdWls ZGVyOjpwcm9jZXNzQmlkaUNvbnRlbnQoY29uc3QgTGluZUJ1aWxkZXI6OkxpbmVDb250CiAgICAg ICAgICAgICAgICAgaWYgKGxhc3REaXNwbGF5Qm94Rm9ySW5saW5lQm94SW5kZXgpCiAgICAgICAg ICAgICAgICAgICAgIGJveGVzW2xhc3REaXNwbGF5Qm94Rm9ySW5saW5lQm94SW5kZXhdLnNldElz TGFzdEJveChmYWxzZSk7CiAgICAgICAgICAgICAgICAgaW5saW5lQm94RGlzcGxheUJveE1hcC5z ZXQoJmlubGluZUJveCwgYm94ZXMuc2l6ZSgpKTsKLSAgICAgICAgICAgICAgICAvLyBGSVhNRTog Q29tcHV0ZSBnZW9tZXRyeSBmb3IgdGhpcyBpbmxpbmUgYm94IGZyYWdtZW50LgotICAgICAgICAg ICAgICAgIGFwcGVuZElubGluZUJveERpc3BsYXlCb3hGb3JCaWRpQm91bmRhcnkoaW5saW5lQm94 LCB7IH0sICFsYXN0RGlzcGxheUJveEZvcklubGluZUJveEluZGV4LCBib3hlcyk7CisgICAgICAg ICAgICAgICAgYXV0byBsb2dpY2FsUmVjdCA9IGxpbmVCb3gubG9naWNhbEJvcmRlckJveEZvcklu bGluZUJveCgqYW5jZXN0b3IsIGZvcm1hdHRpbmdTdGF0ZSgpLmJveEdlb21ldHJ5KCphbmNlc3Rv cikpOworICAgICAgICAgICAgICAgIGFwcGVuZElubGluZUJveERpc3BsYXlCb3hGb3JCaWRpQm91 bmRhcnkoaW5saW5lQm94LCBsb2dpY2FsUmVjdCwgIWxhc3REaXNwbGF5Qm94Rm9ySW5saW5lQm94 SW5kZXgsIGJveGVzKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfTsKICAgICAgICAgaGFuZGxl SW5saW5lQm94Qm91bmRhcmllc0lmQXBwbGljYWJsZSgpOwpAQCAtNDQ4LDE3ICs0NDUsNzggQEAg dm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXI6OnByb2Nlc3NCaWRpQ29udGVudChjb25z dCBMaW5lQnVpbGRlcjo6TGluZUNvbnQKICAgICAgICAgICAgIGFwcGVuZEF0b21pY0lubGluZUxl dmVsRGlzcGxheUJveChsaW5lUnVuLCBkaXNwbGF5Qm94UmVjdCwgYm94ZXMpOwogICAgICAgICBl bHNlCiAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLQotICAgICAgICBjb250ZW50 UmlnaHRJblZpc3VhbE9yZGVyID0gZGlzcGxheUJveFJlY3QucmlnaHQoKTsKICAgICB9CiAKLSAg ICAvLyBDbG9zZSB0aGUgcmVtYWluaW5nIG5lc3RlZCBpbmxpbmUgYm94ZXMuCi0gICAgLy8gPGRp dj5hPHNwYW4+YiYjODIzODtkPC9zcGFuPmM8L2Rpdj4KLSAgICAvLyBBdCB0aGUgZW5kIG9mIHRo ZSBydW4gbGlzdCBsb29wIHdoZW4gd2UgZmluaXNoZWQgcHJvY2Vzc2luZyBbZF0sIHRoZSBpbmxp bmUgYm94ICg8c3Bhbj4pIGlzIHN0aWxsICJvcGVuIi4KLSAgICBmb3IgKGF1dG8mIGlubGluZUJv eEluZGV4IDogaW5saW5lQm94U3RhY2spIHsKLSAgICAgICAgLy8gRklYTUU6IENvbXB1dGUgZ2Vv bWV0cnkgZm9yIHRoaXMgaW5saW5lIGJveCBmcmFnbWVudC4KLSAgICAgICAgYWRqdXN0SW5saW5l Qm94RGlzcGxheUJveEZvckJpZGlCb3VuZGFyeShib3hlc1tpbmxpbmVCb3hJbmRleF0sIHsgfSk7 Ci0gICAgfQorICAgIGF1dG8gY29tcHV0ZVZpc3VhbEdlb21ldHJ5ID0gWyZdIHsKKyAgICAgICAg VmVjdG9yPHNpemVfdD4gaW5saW5lQm94U3RhY2s7CisgICAgICAgIGlubGluZUJveFN0YWNrLnJl c2VydmVJbml0aWFsQ2FwYWNpdHkobGluZUJveC5ub25Sb290SW5saW5lTGV2ZWxCb3hlcygpLnNp emUoKSk7CisKKyAgICAgICAgZm9yIChzaXplX3QgaW5kZXggPSAwOyBpbmRleCA8IGJveGVzLnNp emUoKTsgKytpbmRleCkgeworICAgICAgICAgICAgYXV0byYgZGlzcGxheUJveCA9IGJveGVzW2lu ZGV4XTsKKyAgICAgICAgICAgIGF1dG8mIGxheW91dEJveCA9IGRpc3BsYXlCb3gubGF5b3V0Qm94 KCk7CisKKyAgICAgICAgICAgIGF1dG8gYWRqdXN0Q29udGVudFJpZ2h0QXRJbmxpbmVCb3hFbmQg PSBbJl0geworICAgICAgICAgICAgICAgIC8vIENoZWNrIGlmIGFkZGl0aW9uYWwgb2Zmc2V0IGlz IHJlcXVpcmVkIHdoZW4gd2UgYXJlIGF0IHRoZSBlbmQgb2YgYW4gaW5saW5lIGJveC4KKyAgICAg ICAgICAgICAgICB3aGlsZSAoIWlubGluZUJveFN0YWNrLmlzRW1wdHkoKSkgeworICAgICAgICAg ICAgICAgICAgICBhdXRvJiBpbmxpbmVCb3hEaXNwbGF5Qm94ID0gYm94ZXNbaW5saW5lQm94U3Rh Y2subGFzdCgpXTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKCZsYXlvdXRCb3gucGFyZW50KCkg PT0gJmlubGluZUJveERpc3BsYXlCb3gubGF5b3V0Qm94KCkpCisgICAgICAgICAgICAgICAgICAg ICAgICBicmVhazsKKyAgICAgICAgICAgICAgICAgICAgaW5saW5lQm94U3RhY2sucmVtb3ZlTGFz dCgpOworCisgICAgICAgICAgICAgICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGlu Z1N0YXRlKCkuYm94R2VvbWV0cnkoaW5saW5lQm94RGlzcGxheUJveC5sYXlvdXRCb3goKSk7Cisg ICAgICAgICAgICAgICAgICAgIGlmIChpbmxpbmVCb3hEaXNwbGF5Qm94LmlzRmlyc3RCb3goKSkK KyAgICAgICAgICAgICAgICAgICAgICAgIGlubGluZUJveERpc3BsYXlCb3guc2V0TG9naWNhbFJp Z2h0KGNvbnRlbnRSaWdodEluVmlzdWFsT3JkZXIpOworICAgICAgICAgICAgICAgICAgICBpZiAo aW5saW5lQm94RGlzcGxheUJveC5pc0xhc3RCb3goKSkgeworICAgICAgICAgICAgICAgICAgICAg ICAgaW5saW5lQm94RGlzcGxheUJveC5zZXRMb2dpY2FsUmlnaHQoY29udGVudFJpZ2h0SW5WaXN1 YWxPcmRlciArIGJveEdlb21ldHJ5LmJvcmRlclJpZ2h0KCkgKyBib3hHZW9tZXRyeS5wYWRkaW5n UmlnaHQoKS52YWx1ZV9vcigwKSk7CisgICAgICAgICAgICAgICAgICAgICAgICBjb250ZW50Umln aHRJblZpc3VhbE9yZGVyID0gaW5saW5lQm94RGlzcGxheUJveC5sb2dpY2FsUmlnaHQoKSArIGJv eEdlb21ldHJ5Lm1hcmdpbkVuZCgpOworICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAg ICAgICAgfQorICAgICAgICAgICAgfTsKKyAgICAgICAgICAgIGFkanVzdENvbnRlbnRSaWdodEF0 SW5saW5lQm94RW5kKCk7CisKKyAgICAgICAgICAgIGlmIChkaXNwbGF5Qm94LmlzTm9uUm9vdElu bGluZUJveCgpKSB7CisgICAgICAgICAgICAgICAgaW5saW5lQm94U3RhY2suYXBwZW5kKGluZGV4 KTsKKworICAgICAgICAgICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ1N0YXRl KCkuYm94R2VvbWV0cnkobGF5b3V0Qm94KTsKKyAgICAgICAgICAgICAgICBhdXRvIGRpc3BsYXlC b3hMZWZ0ID0gY29udGVudFJpZ2h0SW5WaXN1YWxPcmRlcjsKKyAgICAgICAgICAgICAgICBpZiAo ZGlzcGxheUJveC5pc0ZpcnN0Qm94KCkpIHsKKyAgICAgICAgICAgICAgICAgICAgZGlzcGxheUJv eExlZnQgKz0gYm94R2VvbWV0cnkubWFyZ2luU3RhcnQoKTsKKyAgICAgICAgICAgICAgICAgICAg Y29udGVudFJpZ2h0SW5WaXN1YWxPcmRlciA9IGRpc3BsYXlCb3hMZWZ0ICsgYm94R2VvbWV0cnku Ym9yZGVyTGVmdCgpICsgYm94R2VvbWV0cnkucGFkZGluZ0xlZnQoKS52YWx1ZV9vcigwKTsKKyAg ICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgZGlzcGxheUJveC5zZXRMb2dpY2FsTGVm dChkaXNwbGF5Qm94TGVmdCk7CisgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAg IGF1dG8gZGlzcGxheUJveExlZnQgPSBJbmxpbmVMYXlvdXRVbml0IHsgfTsKKyAgICAgICAgICAg ICAgICBhdXRvIG1hcmdpblJpZ2h0ID0gSW5saW5lTGF5b3V0VW5pdCB7IH07CisgICAgICAgICAg ICAgICAgaWYgKGRpc3BsYXlCb3guaXNUZXh0KCkgfHwgZGlzcGxheUJveC5pc0xpbmVCcmVhaygp KQorICAgICAgICAgICAgICAgICAgICBkaXNwbGF5Qm94TGVmdCA9IGNvbnRlbnRSaWdodEluVmlz dWFsT3JkZXI7CisgICAgICAgICAgICAgICAgZWxzZSBpZiAoZGlzcGxheUJveC5pc0F0b21pY0lu bGluZUxldmVsQm94KCkgfHwgZGlzcGxheUJveC5pc0dlbmVyaWNJbmxpbmVMZXZlbEJveCgpKSB7 CisgICAgICAgICAgICAgICAgICAgIGF1dG8mIGJveEdlb21ldHJ5ID0gZm9ybWF0dGluZ1N0YXRl KCkuYm94R2VvbWV0cnkobGF5b3V0Qm94KTsKKyAgICAgICAgICAgICAgICAgICAgZGlzcGxheUJv eExlZnQgPSBjb250ZW50UmlnaHRJblZpc3VhbE9yZGVyICsgYm94R2VvbWV0cnkubWFyZ2luU3Rh cnQoKTsKKyAgICAgICAgICAgICAgICAgICAgbWFyZ2luUmlnaHQgPSBib3hHZW9tZXRyeS5tYXJn aW5FbmQoKTsKKyAgICAgICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgICAgICBB U1NFUlQoZGlzcGxheUJveC5pc1Jvb3RJbmxpbmVCb3goKSk7CisgICAgICAgICAgICAgICAgICAg IGNvbnRpbnVlOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICBkaXNwbGF5Qm94 LnNldExvZ2ljYWxMZWZ0KGRpc3BsYXlCb3hMZWZ0KTsKKyAgICAgICAgICAgICAgICBjb250ZW50 UmlnaHRJblZpc3VhbE9yZGVyID0gZGlzcGxheUJveC5sb2dpY2FsUmlnaHQoKSArIG1hcmdpblJp Z2h0OworICAgICAgICAgICAgfQorICAgICAgICB9CisKKyAgICAgICAgLy8gU2luY2UgdGhlIGlu bGluZSBib3hlcyBhcmUgImNsb3NlZCIgdGhyb3VnaCBjb250ZW50IChhcyBvcHBvc2VkIHRvIGV4 cGxpY2l0bHkgd2hlbiB3ZSBzZWUgdGhlICJpbmxpbmUgYm94IGVuZCIgcnVuKSwgc29tZQorICAg ICAgICAvLyBpbmxpbmUgYm94ZXMgbWF5IHN0aWxsIGJlICJvcGVuIiBhbmQgbmVlZCBzaXplIGFk anVzdG1lbnQuCisgICAgICAgIC8vIDxkaXY+YTxzcGFuPmImIzgyMzg7ZDwvc3Bhbj5jPC9kaXY+ CisgICAgICAgIC8vIGFiY2QKKyAgICAgICAgLy8gQXQgdGhlIGVuZCBvZiB0aGUgbG9vcCB3aGVu IHdlIGZpbmlzaGVkIHByb2Nlc3NpbmcgW2RdLCB0aGUgaW5saW5lIGJveCAoPHNwYW4+KSBpcyBz dGlsbCAib3BlbiIgbWVhbmluZyB0aGF0IGl0CisgICAgICAgIC8vIHN0aWxsIGhhcyB0aGUgbG9n aWNhbCBzaXplLgorICAgICAgICBmb3IgKGF1dG8mIGlubGluZUJveEluZGV4IDogaW5saW5lQm94 U3RhY2spIHsKKyAgICAgICAgICAgIGF1dG8mIGRpc3BsYXlCb3ggPSBib3hlc1tpbmxpbmVCb3hJ bmRleF07CisgICAgICAgICAgICBBU1NFUlQoZGlzcGxheUJveC5pc0xhc3RCb3goKSk7CisgICAg ICAgICAgICBhdXRvJiBib3hHZW9tZXRyeSA9IGZvcm1hdHRpbmdTdGF0ZSgpLmJveEdlb21ldHJ5 KGRpc3BsYXlCb3gubGF5b3V0Qm94KCkpOworICAgICAgICAgICAgZGlzcGxheUJveC5zZXRMb2dp Y2FsUmlnaHQoY29udGVudFJpZ2h0SW5WaXN1YWxPcmRlciArIGJveEdlb21ldHJ5LmJvcmRlclJp Z2h0KCkgKyBib3hHZW9tZXRyeS5wYWRkaW5nUmlnaHQoKS52YWx1ZV9vcigwKSk7CisgICAgICAg ICAgICBjb250ZW50UmlnaHRJblZpc3VhbE9yZGVyID0gZGlzcGxheUJveC5sb2dpY2FsUmlnaHQo KSArIGJveEdlb21ldHJ5Lm1hcmdpbkVuZCgpOworICAgICAgICB9CisgICAgfTsKKyAgICBjb21w dXRlVmlzdWFsR2VvbWV0cnkoKTsKIH0KIAogdm9pZCBJbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxk ZXI6OnByb2Nlc3NPdmVyZmxvd25SdW5zRm9yRWxsaXBzaXMoRGlzcGxheUJveGVzJiBib3hlcywg SW5saW5lTGF5b3V0VW5pdCBsaW5lQm94TG9naWNhbFJpZ2h0KQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lRGlzcGxheUNv bnRlbnRCdWlsZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuaAppbmRleCA3ZTUzODU4MzYxMTgy OTg2MjEzZjk0YWI2MmE5NmQyZTA5YzQyODhkLi40YjVhNGEyMWVmNDFiNjRlZTA1NjMyY2JlMjcy N2Q3MmVkZDM4MjQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5Q29udGVudEJ1aWxkZXIuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVEaXNwbGF5 Q29udGVudEJ1aWxkZXIuaApAQCAtNTYsNyArNTYsNiBAQCBwcml2YXRlOgogICAgIHZvaWQgYXBw ZW5kSW5saW5lQm94RGlzcGxheUJveChjb25zdCBMaW5lOjpSdW4mLCBjb25zdCBJbmxpbmVMZXZl bEJveCYsIGNvbnN0IElubGluZVJlY3QmLCBib29sIGxpbmVoYXNDb250ZW50LCBEaXNwbGF5Qm94 ZXMmKTsKICAgICB2b2lkIGFwcGVuZFNwYW5uaW5nSW5saW5lQm94RGlzcGxheUJveChjb25zdCBM aW5lOjpSdW4mLCBjb25zdCBJbmxpbmVMZXZlbEJveCYsIGNvbnN0IElubGluZVJlY3QmLCBEaXNw bGF5Qm94ZXMmKTsKICAgICB2b2lkIGFwcGVuZElubGluZUJveERpc3BsYXlCb3hGb3JCaWRpQm91 bmRhcnkoY29uc3QgQm94JiwgY29uc3QgSW5saW5lUmVjdCYsIGJvb2wgaXNGaXJzdElubGluZUJv eEZyYWdtZW50LCBEaXNwbGF5Qm94ZXMmKTsKLSAgICB2b2lkIGFkanVzdElubGluZUJveERpc3Bs YXlCb3hGb3JCaWRpQm91bmRhcnkoSW5saW5lRGlzcGxheTo6Qm94JiwgY29uc3QgSW5saW5lUmVj dCYpOwogCiAgICAgY29uc3QgQ29udGFpbmVyQm94JiByb290KCkgY29uc3QgeyByZXR1cm4gbV9m b3JtYXR0aW5nQ29udGV4dFJvb3Q7IH0KICAgICBJbmxpbmVGb3JtYXR0aW5nU3RhdGUmIGZvcm1h dHRpbmdTdGF0ZSgpIGNvbnN0IHsgcmV0dXJuIG1fZm9ybWF0dGluZ1N0YXRlOyB9IApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvZGlz cGxheS9JbmxpbmVEaXNwbGF5Qm94LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGlu Z0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlCb3guaAppbmRleCA0MTgyMmRm M2ZlYjQ2ODdmOTRjZDYwMTY3YTQ2ZmM5ZWIyZjViMmE5Li4yZjZmZmZiODljOWJjYjAzZmE3ZDk1 MzNiMmNmMGIyMWVjMjJlMDBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lubGluZURpc3BsYXlCb3guaAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9kaXNwbGF5L0lu bGluZURpc3BsYXlCb3guaApAQCAtMTA1LDYgKzEwNSw4IEBAIHN0cnVjdCBCb3ggewogICAgIExh eW91dDo6SW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgoKSBjb25zdCB7IHJldHVybiBsb2dp Y2FsUmVjdCgpLndpZHRoKCk7IH0KICAgICBMYXlvdXQ6OklubGluZUxheW91dFVuaXQgbG9naWNh bEhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIGxvZ2ljYWxSZWN0KCkuaGVpZ2h0KCk7IH0KIAorICAg IHZvaWQgc2V0TG9naWNhbExlZnQoY29uc3QgTGF5b3V0OjpJbmxpbmVMYXlvdXRVbml0IGxlZnQp IHsgbV9sb2dpY2FsUmVjdC5zZXRMZWZ0KGxlZnQpOyB9CisgICAgdm9pZCBzZXRMb2dpY2FsUmln aHQoY29uc3QgTGF5b3V0OjpJbmxpbmVMYXlvdXRVbml0IHJpZ2h0KSB7IG1fbG9naWNhbFJlY3Qu c2V0UmlnaHQocmlnaHQpOyB9CiAgICAgdm9pZCBtb3ZlVmVydGljYWxseShMYXlvdXQ6OklubGlu ZUxheW91dFVuaXQgb2Zmc2V0KSB7IG1fbG9naWNhbFJlY3QubW92ZVZlcnRpY2FsbHkob2Zmc2V0 KTsgfQogICAgIHZvaWQgbW92ZUhvcml6b250YWxseShMYXlvdXQ6OklubGluZUxheW91dFVuaXQg b2Zmc2V0KSB7IG1fbG9naWNhbFJlY3QubW92ZUhvcml6b250YWxseShvZmZzZXQpOyB9CiAgICAg dm9pZCBhZGp1c3RJbmtPdmVyZmxvdyhjb25zdCBMYXlvdXQ6OklubGluZVJlY3QmIGNoaWxkQm9y ZGVyQm94KSB7IHJldHVybiBtX2lua092ZXJmbG93LmV4cGFuZFRvQ29udGFpbihjaGlsZEJvcmRl ckJveCk7IH0K