241070 2022-05-28 17:10:30 -0700 [LFC][FFC] Compute available space when ConstraintsForFlexContent does not provide one 2022-05-29 07:04:12 -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 1872569 0 zalan 2022-05-28 17:10:30 -0700 e.g. when the flex box does not have fixed height 1872571 1 459829 zalan 2022-05-28 17:13:31 -0700 Created attachment 459829 [fast-cq]Patch 1872614 2 ews-feeder 2022-05-29 07:03:56 -0700 Committed r295015 (251110@main): <https://commits.webkit.org/251110@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 459829. 1872615 3 webkit-bug-importer 2022-05-29 07:04:12 -0700 <rdar://problem/94088326> 459829 2022-05-28 17:13:31 -0700 2022-05-29 07:03:57 -0700 [fast-cq]Patch bug-241070-20220528171330.patch text/plain 11961 zalan RnJvbSBjNWI5NmZjNTA2ODAxOTZkMGUzMjYxZTA5NWQyNjc5ZDQ5MDliYmFkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBT YXQsIDI4IE1heSAyMDIyIDE3OjEwOjU3IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gW0xGQ11bRkZD XSBDb21wdXRlIGF2YWlsYWJsZSBzcGFjZSB3aGVuCiBDb25zdHJhaW50c0ZvckZsZXhDb250ZW50 IGRvZXMgbm90IHByb3ZpZGUgb25lCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjQxMDcwCgpSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KCmUuZy4gaWYgdGhlIGZs ZXggYm94IGRvZXMgbm90IGhhdmUgZml4ZWQgaGVpZ2h0IGluIHRoZSBjcm9zcyBheGlzIGRpcmVj dGlvbiwgYWxsIGZsZXggaXRlbXMgYmVjb21lIGFzIHRhbGwgYXMgdGhlIHRhbGxlc3QgZmxleCBp dGVtLgoKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2ZsZXgvRmxl eEZvcm1hdHRpbmdDb250ZXh0LmNwcDoKKFdlYkNvcmU6OkxheW91dDo6RmxleEZvcm1hdHRpbmdD b250ZXh0Ojpjb21wdXRlQXZhaWxhYmxlTG9naWNhbFZlcnRpY2FsU3BhY2UgY29uc3QpOgooV2Vi Q29yZTo6TGF5b3V0OjpGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVBdmFpbGFibGVMb2dp Y2FsSG9yaXpvbnRhbFNwYWNlIGNvbnN0KToKKFdlYkNvcmU6OkxheW91dDo6RmxleEZvcm1hdHRp bmdDb250ZXh0Ojpjb21wdXRlTG9naWNhbFdpZHRoRm9yRmxleEl0ZW1zKToKKFdlYkNvcmU6Okxh eW91dDo6RmxleEZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlTG9naWNhbEhlaWdodEZvckZsZXhJ dGVtcyk6CihXZWJDb3JlOjpMYXlvdXQ6OkZsZXhGb3JtYXR0aW5nQ29udGV4dDo6YWxpZ25GbGV4 SXRlbXMpOgooV2ViQ29yZTo6TGF5b3V0OjpGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6OmxheW91dElu Rmxvd0NvbnRlbnRGb3JJbnRlZ3JhdGlvbik6CihXZWJDb3JlOjpMYXlvdXQ6OmF2YWlsYWJsZUxv Z2ljYWxWZXJ0aWNhbFNwYWNlKTogRGVsZXRlZC4KKFdlYkNvcmU6OkxheW91dDo6YXZhaWxhYmxl TG9naWNhbEhvcml6b250YWxTcGFjZSk6IERlbGV0ZWQuCiogU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5oOgotLS0KIC4u Li9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5jcHAgICAgICAgICAgICB8IDc4ICsrKysrKysr KysrKy0tLS0tLS0KIC4uLi9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5oICAgICAgICAgICAg ICB8ICA4ICstCiAyIGZpbGVzIGNoYW5nZWQsIDU1IGluc2VydGlvbnMoKyksIDMxIGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4 dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXgg MjNlYjU0YmViZDBiLi4yMjY5NWI0ZWU2YTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9ybWF0dGluZ0NvbnRleHQuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvZmxleC9GbGV4Rm9y bWF0dGluZ0NvbnRleHQuY3BwCkBAIC0xMTksMTggKzExOSw0MiBAQCB2b2lkIEZsZXhGb3JtYXR0 aW5nQ29udGV4dDo6Y29tcHV0ZUludHJpbnNpY1dpZHRoQ29uc3RyYWludHNGb3JGbGV4SXRlbXMo KQogICAgIH0KIH0KIAotc3RhdGljIGlubGluZSBzdGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IGF2 YWlsYWJsZUxvZ2ljYWxWZXJ0aWNhbFNwYWNlKGNvbnN0IENvbnRhaW5lckJveCYgcm9vdCwgY29u c3QgQ29uc3RyYWludHNGb3JGbGV4Q29udGVudCYgZmxleENvbnN0cmFpbnRzKQorTGF5b3V0VW5p dCBGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVBdmFpbGFibGVMb2dpY2FsVmVydGljYWxT cGFjZShMb2dpY2FsRmxleEl0ZW1zJiBsb2dpY2FsRmxleEl0ZW1MaXN0LCBjb25zdCBDb25zdHJh aW50c0ZvckZsZXhDb250ZW50JiBmbGV4Q29uc3RyYWludHMpIGNvbnN0CiB7Ci0gICAgYXV0byBm bGV4RGlyZWN0aW9uID0gcm9vdC5zdHlsZSgpLmZsZXhEaXJlY3Rpb24oKTsKLSAgICBhdXRvIGZs ZXhEaXJlY3Rpb25Jc0lubGluZUF4aXMgPSBmbGV4RGlyZWN0aW9uID09IEZsZXhEaXJlY3Rpb246 OlJvdyB8fCBmbGV4RGlyZWN0aW9uID09IEZsZXhEaXJlY3Rpb246OlJvd1JldmVyc2U7Ci0gICAg cmV0dXJuIHsgZmxleERpcmVjdGlvbklzSW5saW5lQXhpcyA/IGZsZXhDb25zdHJhaW50cy5hdmFp bGFibGVWZXJ0aWNhbFNwYWNlKCkgOiBzdGQ6Om1ha2Vfb3B0aW9uYWwoZmxleENvbnN0cmFpbnRz Lmhvcml6b250YWwoKS5sb2dpY2FsV2lkdGgpIH07CisgICAgYXV0byBhdmFpbGFibGVMb2dpY2Fs VmVydGljYWxTcGFjZUZyb21Db25zdHJhaW50ID0gWyZdIHsKKyAgICAgICAgYXV0byBmbGV4RGly ZWN0aW9uID0gcm9vdCgpLnN0eWxlKCkuZmxleERpcmVjdGlvbigpOworICAgICAgICBhdXRvIGZs ZXhEaXJlY3Rpb25Jc0lubGluZUF4aXMgPSBmbGV4RGlyZWN0aW9uID09IEZsZXhEaXJlY3Rpb246 OlJvdyB8fCBmbGV4RGlyZWN0aW9uID09IEZsZXhEaXJlY3Rpb246OlJvd1JldmVyc2U7CisgICAg ICAgIGlmIChmbGV4RGlyZWN0aW9uSXNJbmxpbmVBeGlzKQorICAgICAgICAgICAgcmV0dXJuIGZs ZXhDb25zdHJhaW50cy5hdmFpbGFibGVWZXJ0aWNhbFNwYWNlKCk7CisgICAgICAgIHJldHVybiBz dGQ6Om9wdGlvbmFsPExheW91dFVuaXQ+IHsgZmxleENvbnN0cmFpbnRzLmhvcml6b250YWwoKS5s b2dpY2FsV2lkdGggfTsKKyAgICB9OworCisgICAgaWYgKGF1dG8gYXZhaWxhYmxlU3BhY2UgPSBh dmFpbGFibGVMb2dpY2FsVmVydGljYWxTcGFjZUZyb21Db25zdHJhaW50KCkpCisgICAgICAgIHJl dHVybiAqYXZhaWxhYmxlU3BhY2U7CisKKyAgICBhdXRvIGF2YWlsYWJsZVNwYWNlID0gTGF5b3V0 VW5pdCB7IH07CisgICAgZm9yIChhdXRvJiBsb2dpY2FsRmxleEl0ZW0gOiBsb2dpY2FsRmxleEl0 ZW1MaXN0KQorICAgICAgICBhdmFpbGFibGVTcGFjZSA9IHN0ZDo6bWF4KGF2YWlsYWJsZVNwYWNl LCBsb2dpY2FsRmxleEl0ZW0ucmVjdC5oZWlnaHQoKSk7CisgICAgcmV0dXJuIGF2YWlsYWJsZVNw YWNlOwogfQogCi1zdGF0aWMgaW5saW5lIHN0ZDo6b3B0aW9uYWw8TGF5b3V0VW5pdD4gYXZhaWxh YmxlTG9naWNhbEhvcml6b250YWxTcGFjZShjb25zdCBDb250YWluZXJCb3gmIHJvb3QsIGNvbnN0 IENvbnN0cmFpbnRzRm9yRmxleENvbnRlbnQmIGZsZXhDb25zdHJhaW50cykKK0xheW91dFVuaXQg RmxleEZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlQXZhaWxhYmxlTG9naWNhbEhvcml6b250YWxT cGFjZShMb2dpY2FsRmxleEl0ZW1zJiBsb2dpY2FsRmxleEl0ZW1MaXN0LCBjb25zdCBDb25zdHJh aW50c0ZvckZsZXhDb250ZW50JiBmbGV4Q29uc3RyYWludHMpIGNvbnN0CiB7Ci0gICAgYXV0byBm bGV4RGlyZWN0aW9uID0gcm9vdC5zdHlsZSgpLmZsZXhEaXJlY3Rpb24oKTsKLSAgICBhdXRvIGZs ZXhEaXJlY3Rpb25Jc0lubGluZUF4aXMgPSBmbGV4RGlyZWN0aW9uID09IEZsZXhEaXJlY3Rpb246 OlJvdyB8fCBmbGV4RGlyZWN0aW9uID09IEZsZXhEaXJlY3Rpb246OlJvd1JldmVyc2U7Ci0gICAg cmV0dXJuIHsgZmxleERpcmVjdGlvbklzSW5saW5lQXhpcyA/IHN0ZDo6bWFrZV9vcHRpb25hbChm bGV4Q29uc3RyYWludHMuaG9yaXpvbnRhbCgpLmxvZ2ljYWxXaWR0aCkgOiBmbGV4Q29uc3RyYWlu dHMuYXZhaWxhYmxlVmVydGljYWxTcGFjZSgpIH07CisgICAgYXV0byBhdmFpbGFibGVMb2dpY2Fs SG9yaXpvbnRhbFNwYWNlRnJvbUNvbnN0cmFpbnQgPSBbJl0geworICAgICAgICBhdXRvIGZsZXhE aXJlY3Rpb24gPSByb290KCkuc3R5bGUoKS5mbGV4RGlyZWN0aW9uKCk7CisgICAgICAgIGF1dG8g ZmxleERpcmVjdGlvbklzSW5saW5lQXhpcyA9IGZsZXhEaXJlY3Rpb24gPT0gRmxleERpcmVjdGlv bjo6Um93IHx8IGZsZXhEaXJlY3Rpb24gPT0gRmxleERpcmVjdGlvbjo6Um93UmV2ZXJzZTsKKyAg ICAgICAgaWYgKGZsZXhEaXJlY3Rpb25Jc0lubGluZUF4aXMpCisgICAgICAgICAgICByZXR1cm4g c3RkOjpvcHRpb25hbDxMYXlvdXRVbml0PiB7IGZsZXhDb25zdHJhaW50cy5ob3Jpem9udGFsKCku bG9naWNhbFdpZHRoIH07IAorICAgICAgICByZXR1cm4gZmxleENvbnN0cmFpbnRzLmF2YWlsYWJs ZVZlcnRpY2FsU3BhY2UoKTsKKyAgICB9OworCisgICAgaWYgKGF1dG8gYXZhaWxhYmxlU3BhY2Ug PSBhdmFpbGFibGVMb2dpY2FsSG9yaXpvbnRhbFNwYWNlRnJvbUNvbnN0cmFpbnQoKSkKKyAgICAg ICAgcmV0dXJuICphdmFpbGFibGVTcGFjZTsKKworICAgIGF1dG8gYXZhaWxhYmxlU3BhY2UgPSBM YXlvdXRVbml0IHsgfTsKKyAgICBmb3IgKGF1dG8mIGxvZ2ljYWxGbGV4SXRlbSA6IGxvZ2ljYWxG bGV4SXRlbUxpc3QpCisgICAgICAgIGF2YWlsYWJsZVNwYWNlICs9IGxvZ2ljYWxGbGV4SXRlbS5y ZWN0LndpZHRoKCk7CisgICAgcmV0dXJuIGF2YWlsYWJsZVNwYWNlOwogfQogCiBGbGV4Rm9ybWF0 dGluZ0NvbnRleHQ6OkxvZ2ljYWxGbGV4SXRlbXMgRmxleEZvcm1hdHRpbmdDb250ZXh0Ojpjb252 ZXJ0RmxleEl0ZW1zVG9Mb2dpY2FsU3BhY2UoKQpAQCAtMzYwLDkgKzM4NCw4IEBAIHZvaWQgRmxl eEZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlTG9naWNhbFdpZHRoRm9yU3RyZXRjaGluZ0ZsZXhJ dGVtcyhMb2dpY2FsRmxlCiAgICAgY29tcHV0ZUxvZ2ljYWxXaWR0aCgpOwogfQogCi12b2lkIEZs ZXhGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aEZvckZsZXhJdGVtcyhMb2dp Y2FsRmxleEl0ZW1zJiBsb2dpY2FsRmxleEl0ZW1MaXN0LCBjb25zdCBDb25zdHJhaW50c0ZvckZs ZXhDb250ZW50JiBmbGV4Q29uc3RyYWludHMpCit2b2lkIEZsZXhGb3JtYXR0aW5nQ29udGV4dDo6 Y29tcHV0ZUxvZ2ljYWxXaWR0aEZvckZsZXhJdGVtcyhMb2dpY2FsRmxleEl0ZW1zJiBsb2dpY2Fs RmxleEl0ZW1MaXN0LCBMYXlvdXRVbml0IGF2YWlsYWJsZVNwYWNlKQogewotICAgIGF1dG8gYXZh aWxhYmxlU3BhY2UgPSBhdmFpbGFibGVMb2dpY2FsSG9yaXpvbnRhbFNwYWNlKHJvb3QoKSwgZmxl eENvbnN0cmFpbnRzKTsKICAgICBhdXRvIGNvbnRlbnRMb2dpY2FsV2lkdGggPSBbJl0gewogICAg ICAgICBhdXRvIGxvZ2ljYWxXaWR0aCA9IExheW91dFVuaXQgeyB9OwogICAgICAgICBmb3IgKGF1 dG8mIGxvZ2ljYWxGbGV4SXRlbSA6IGxvZ2ljYWxGbGV4SXRlbUxpc3QpCkBAIC0zNzAsMTggKzM5 MywxNiBAQCB2b2lkIEZsZXhGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUxvZ2ljYWxXaWR0aEZv ckZsZXhJdGVtcyhMb2dpY2FsRmxleEl0ZW1zJiBsbwogICAgICAgICByZXR1cm4gbG9naWNhbFdp ZHRoOwogICAgIH0oKTsKIAotICAgIGlmICghYXZhaWxhYmxlU3BhY2UpCi0gICAgICAgIEFTU0VS VF9OT1RfSU1QTEVNRU5URURfWUVUKCk7Ci0gICAgZWxzZSBpZiAoKmF2YWlsYWJsZVNwYWNlID4g Y29udGVudExvZ2ljYWxXaWR0aCkKLSAgICAgICAgY29tcHV0ZUxvZ2ljYWxXaWR0aEZvclN0cmV0 Y2hpbmdGbGV4SXRlbXMobG9naWNhbEZsZXhJdGVtTGlzdCwgKmF2YWlsYWJsZVNwYWNlKTsKLSAg ICBlbHNlIGlmICgqYXZhaWxhYmxlU3BhY2UgPCBjb250ZW50TG9naWNhbFdpZHRoKQotICAgICAg ICBjb21wdXRlTG9naWNhbFdpZHRoRm9yU2hyaW5raW5nRmxleEl0ZW1zKGxvZ2ljYWxGbGV4SXRl bUxpc3QsICphdmFpbGFibGVTcGFjZSk7CisgICAgaWYgKGF2YWlsYWJsZVNwYWNlID4gY29udGVu dExvZ2ljYWxXaWR0aCkKKyAgICAgICAgY29tcHV0ZUxvZ2ljYWxXaWR0aEZvclN0cmV0Y2hpbmdG bGV4SXRlbXMobG9naWNhbEZsZXhJdGVtTGlzdCwgYXZhaWxhYmxlU3BhY2UpOworICAgIGVsc2Ug aWYgKGF2YWlsYWJsZVNwYWNlIDwgY29udGVudExvZ2ljYWxXaWR0aCkKKyAgICAgICAgY29tcHV0 ZUxvZ2ljYWxXaWR0aEZvclNocmlua2luZ0ZsZXhJdGVtcyhsb2dpY2FsRmxleEl0ZW1MaXN0LCBh dmFpbGFibGVTcGFjZSk7CiB9CiAKLXZvaWQgRmxleEZvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRl TG9naWNhbEhlaWdodEZvckZsZXhJdGVtcyhMb2dpY2FsRmxleEl0ZW1zJiBsb2dpY2FsRmxleEl0 ZW1MaXN0LCBjb25zdCBDb25zdHJhaW50c0ZvckZsZXhDb250ZW50JiBmbGV4Q29uc3RyYWludHMp Cit2b2lkIEZsZXhGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUxvZ2ljYWxIZWlnaHRGb3JGbGV4 SXRlbXMoTG9naWNhbEZsZXhJdGVtcyYgbG9naWNhbEZsZXhJdGVtTGlzdCwgTGF5b3V0VW5pdCBh dmFpbGFibGVTcGFjZSkKIHsKLSAgICBhdXRvIGF2YWlsYWJsZVNwYWNlID0gYXZhaWxhYmxlTG9n aWNhbFZlcnRpY2FsU3BhY2Uocm9vdCgpLCBmbGV4Q29uc3RyYWludHMpOwogICAgIGF1dG8gYWxp Z25JdGVtcyA9IHJvb3QoKS5zdHlsZSgpLmFsaWduSXRlbXMoKTsKKwogICAgIGZvciAoYXV0byYg bG9naWNhbEZsZXhJdGVtIDogbG9naWNhbEZsZXhJdGVtTGlzdCkgewogICAgICAgICBhdXRvJiBo ZWlnaHQgPSBsb2dpY2FsRmxleEl0ZW0ubGF5b3V0Qm94LT5zdHlsZSgpLmhlaWdodCgpOwogICAg ICAgICBpZiAoIWhlaWdodC5pc0F1dG8oKSkKQEAgLTM4OSw3ICs0MTAsNyBAQCB2b2lkIEZsZXhG b3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUxvZ2ljYWxIZWlnaHRGb3JGbGV4SXRlbXMoTG9naWNh bEZsZXhJdGVtcyYgbAogICAgICAgICBzd2l0Y2ggKGFsaWduSXRlbXMucG9zaXRpb24oKSkgewog ICAgICAgICBjYXNlIEl0ZW1Qb3NpdGlvbjo6Tm9ybWFsOgogICAgICAgICBjYXNlIEl0ZW1Qb3Np dGlvbjo6U3RyZXRjaDoKLSAgICAgICAgICAgIGxvZ2ljYWxGbGV4SXRlbS5yZWN0LnNldEhlaWdo dCgqYXZhaWxhYmxlU3BhY2UpOworICAgICAgICAgICAgbG9naWNhbEZsZXhJdGVtLnJlY3Quc2V0 SGVpZ2h0KGF2YWlsYWJsZVNwYWNlKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNl IEl0ZW1Qb3NpdGlvbjo6Q2VudGVyOgogICAgICAgICBjYXNlIEl0ZW1Qb3NpdGlvbjo6U3RhcnQ6 CkBAIC00MDQsMTEgKzQyNSwxMCBAQCB2b2lkIEZsZXhGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0 ZUxvZ2ljYWxIZWlnaHRGb3JGbGV4SXRlbXMoTG9naWNhbEZsZXhJdGVtcyYgbAogICAgIH0KIH0K IAotdm9pZCBGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6OmFsaWduRmxleEl0ZW1zKExvZ2ljYWxGbGV4 SXRlbXMmIGxvZ2ljYWxGbGV4SXRlbUxpc3QsIGNvbnN0IENvbnN0cmFpbnRzRm9yRmxleENvbnRl bnQmIGZsZXhDb25zdHJhaW50cykKK3ZvaWQgRmxleEZvcm1hdHRpbmdDb250ZXh0OjphbGlnbkZs ZXhJdGVtcyhMb2dpY2FsRmxleEl0ZW1zJiBsb2dpY2FsRmxleEl0ZW1MaXN0LCBMYXlvdXRVbml0 IGF2YWlsYWJsZVNwYWNlKQogewogICAgIC8vIEZJWE1FOiBDaGVjayBpZiBoZWlnaHQgY29tcHV0 YXRpb24gYW5kIHZlcnRpY2FsIGFsaWdubWVudCBzaG91bGQgbWVyZ2UuCiAgICAgYXV0byBhbGln bkl0ZW1zID0gcm9vdCgpLnN0eWxlKCkuYWxpZ25JdGVtcygpOwotICAgIGF1dG8gYXZhaWxhYmxl U3BhY2UgPSBhdmFpbGFibGVMb2dpY2FsVmVydGljYWxTcGFjZShyb290KCksIGZsZXhDb25zdHJh aW50cyk7CiAKICAgICBmb3IgKGF1dG8mIGxvZ2ljYWxGbGV4SXRlbSA6IGxvZ2ljYWxGbGV4SXRl bUxpc3QpIHsKICAgICAgICAgc3dpdGNoIChhbGlnbkl0ZW1zLnBvc2l0aW9uKCkpIHsKQEAgLTQx Nyw3ICs0MzcsNyBAQCB2b2lkIEZsZXhGb3JtYXR0aW5nQ29udGV4dDo6YWxpZ25GbGV4SXRlbXMo TG9naWNhbEZsZXhJdGVtcyYgbG9naWNhbEZsZXhJdGVtTGlzdAogICAgICAgICAgICAgbG9naWNh bEZsZXhJdGVtLnJlY3Quc2V0VG9wKHsgfSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAg Y2FzZSBJdGVtUG9zaXRpb246OkNlbnRlcjoKLSAgICAgICAgICAgIGxvZ2ljYWxGbGV4SXRlbS5y ZWN0LnNldFRvcCh7ICphdmFpbGFibGVTcGFjZSAvIDIgLSAgbG9naWNhbEZsZXhJdGVtLnJlY3Qu aGVpZ2h0KCkgLyAyIH0pOworICAgICAgICAgICAgbG9naWNhbEZsZXhJdGVtLnJlY3Quc2V0VG9w KHsgYXZhaWxhYmxlU3BhY2UgLyAyIC0gIGxvZ2ljYWxGbGV4SXRlbS5yZWN0LmhlaWdodCgpIC8g MiB9KTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBjYXNlIEl0ZW1Qb3NpdGlvbjo6U3Rh cnQ6CiAgICAgICAgIGNhc2UgSXRlbVBvc2l0aW9uOjpGbGV4U3RhcnQ6CkBAIC00MjUsNyArNDQ1 LDcgQEAgdm9pZCBGbGV4Rm9ybWF0dGluZ0NvbnRleHQ6OmFsaWduRmxleEl0ZW1zKExvZ2ljYWxG bGV4SXRlbXMmIGxvZ2ljYWxGbGV4SXRlbUxpc3QKICAgICAgICAgICAgIGJyZWFrOwogICAgICAg ICBjYXNlIEl0ZW1Qb3NpdGlvbjo6RW5kOgogICAgICAgICBjYXNlIEl0ZW1Qb3NpdGlvbjo6Rmxl eEVuZDoKLSAgICAgICAgICAgIGxvZ2ljYWxGbGV4SXRlbS5yZWN0LnNldFRvcCh7ICphdmFpbGFi bGVTcGFjZSAtIGxvZ2ljYWxGbGV4SXRlbS5yZWN0LmhlaWdodCgpIH0pOworICAgICAgICAgICAg bG9naWNhbEZsZXhJdGVtLnJlY3Quc2V0VG9wKHsgYXZhaWxhYmxlU3BhY2UgLSBsb2dpY2FsRmxl eEl0ZW0ucmVjdC5oZWlnaHQoKSB9KTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBkZWZh dWx0OgogICAgICAgICAgICAgQVNTRVJUX05PVF9JTVBMRU1FTlRFRF9ZRVQoKTsKQEAgLTQzNywx NCArNDU3LDE2IEBAIHZvaWQgRmxleEZvcm1hdHRpbmdDb250ZXh0OjphbGlnbkZsZXhJdGVtcyhM b2dpY2FsRmxleEl0ZW1zJiBsb2dpY2FsRmxleEl0ZW1MaXN0CiB2b2lkIEZsZXhGb3JtYXR0aW5n Q29udGV4dDo6bGF5b3V0SW5GbG93Q29udGVudEZvckludGVncmF0aW9uKGNvbnN0IENvbnN0cmFp bnRzRm9ySW5GbG93Q29udGVudCYgY29uc3RyYWludHMpCiB7CiAgICAgYXV0byBsb2dpY2FsRmxl eEl0ZW1MaXN0ID0gY29udmVydEZsZXhJdGVtc1RvTG9naWNhbFNwYWNlKCk7Ci0KICAgICBhdXRv IGZsZXhDb25zdHJhaW50cyA9IGRvd25jYXN0PENvbnN0cmFpbnRzRm9yRmxleENvbnRlbnQ+KGNv bnN0cmFpbnRzKTsKLSAgICBhdXRvIGxvZ2ljYWxMZWZ0ID0gTGF5b3V0VW5pdCB7IH07CiAKLSAg ICBjb21wdXRlTG9naWNhbFdpZHRoRm9yRmxleEl0ZW1zKGxvZ2ljYWxGbGV4SXRlbUxpc3QsIGZs ZXhDb25zdHJhaW50cyk7Ci0gICAgY29tcHV0ZUxvZ2ljYWxIZWlnaHRGb3JGbGV4SXRlbXMobG9n aWNhbEZsZXhJdGVtTGlzdCwgZmxleENvbnN0cmFpbnRzKTsKLSAgICBhbGlnbkZsZXhJdGVtcyhs b2dpY2FsRmxleEl0ZW1MaXN0LCBmbGV4Q29uc3RyYWludHMpOworICAgIGF1dG8gYXZhaWxhYmxl TG9naWNhbEhvcml6b250YWxTcGFjZSA9IGNvbXB1dGVBdmFpbGFibGVMb2dpY2FsSG9yaXpvbnRh bFNwYWNlKGxvZ2ljYWxGbGV4SXRlbUxpc3QsIGZsZXhDb25zdHJhaW50cyk7CisgICAgY29tcHV0 ZUxvZ2ljYWxXaWR0aEZvckZsZXhJdGVtcyhsb2dpY2FsRmxleEl0ZW1MaXN0LCBhdmFpbGFibGVM b2dpY2FsSG9yaXpvbnRhbFNwYWNlKTsKIAorICAgIGF1dG8gYXZhaWxhYmxlTG9naWNhbFZlcnRp Y2FsU3BhY2UgPSBjb21wdXRlQXZhaWxhYmxlTG9naWNhbFZlcnRpY2FsU3BhY2UobG9naWNhbEZs ZXhJdGVtTGlzdCwgZmxleENvbnN0cmFpbnRzKTsKKyAgICBjb21wdXRlTG9naWNhbEhlaWdodEZv ckZsZXhJdGVtcyhsb2dpY2FsRmxleEl0ZW1MaXN0LCBhdmFpbGFibGVMb2dpY2FsVmVydGljYWxT cGFjZSk7CisgICAgYWxpZ25GbGV4SXRlbXMobG9naWNhbEZsZXhJdGVtTGlzdCwgYXZhaWxhYmxl TG9naWNhbFZlcnRpY2FsU3BhY2UpOworCisgICAgYXV0byBsb2dpY2FsTGVmdCA9IExheW91dFVu aXQgeyB9OwogICAgIGZvciAoYXV0byYgbG9naWNhbEZsZXhJdGVtIDogbG9naWNhbEZsZXhJdGVt TGlzdCkgewogICAgICAgICBsb2dpY2FsRmxleEl0ZW0ucmVjdC5zZXRMZWZ0KGxvZ2ljYWxMZWZ0 KTsKICAgICAgICAgbG9naWNhbExlZnQgPSBsb2dpY2FsRmxleEl0ZW0ucmVjdC5yaWdodCgpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4 L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4dC5oCmluZGV4IGJlNDljOGVkZjkz Ni4uYzIxNjc5NGY0ODZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0 dGluZ0NvbnRleHRzL2ZsZXgvRmxleEZvcm1hdHRpbmdDb250ZXh0LmgKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9mbGV4L0ZsZXhGb3JtYXR0aW5nQ29udGV4 dC5oCkBAIC02NSwxMSArNjUsMTMgQEAgcHJpdmF0ZToKICAgICB1c2luZyBMb2dpY2FsRmxleEl0 ZW1zID0gVmVjdG9yPExvZ2ljYWxGbGV4SXRlbT47CiAgICAgTG9naWNhbEZsZXhJdGVtcyBjb252 ZXJ0RmxleEl0ZW1zVG9Mb2dpY2FsU3BhY2UoKTsKICAgICB2b2lkIHNldEZsZXhJdGVtc0dlb21l dHJ5KGNvbnN0IExvZ2ljYWxGbGV4SXRlbXMmLCBjb25zdCBDb25zdHJhaW50c0ZvckZsZXhDb250 ZW50Jik7Ci0gICAgdm9pZCBjb21wdXRlTG9naWNhbFdpZHRoRm9yRmxleEl0ZW1zKExvZ2ljYWxG bGV4SXRlbXMmLCBjb25zdCBDb25zdHJhaW50c0ZvckZsZXhDb250ZW50Jik7CisgICAgdm9pZCBj b21wdXRlTG9naWNhbFdpZHRoRm9yRmxleEl0ZW1zKExvZ2ljYWxGbGV4SXRlbXMmLCBMYXlvdXRV bml0IGF2YWlsYWJsZVNwYWNlKTsKICAgICB2b2lkIGNvbXB1dGVMb2dpY2FsV2lkdGhGb3JTdHJl dGNoaW5nRmxleEl0ZW1zKExvZ2ljYWxGbGV4SXRlbXMmLCBMYXlvdXRVbml0IGF2YWlsYWJsZVNw YWNlKTsKICAgICB2b2lkIGNvbXB1dGVMb2dpY2FsV2lkdGhGb3JTaHJpbmtpbmdGbGV4SXRlbXMo TG9naWNhbEZsZXhJdGVtcyYsIExheW91dFVuaXQgYXZhaWxhYmxlU3BhY2UpOwotICAgIHZvaWQg Y29tcHV0ZUxvZ2ljYWxIZWlnaHRGb3JGbGV4SXRlbXMoTG9naWNhbEZsZXhJdGVtcyYsIGNvbnN0 IENvbnN0cmFpbnRzRm9yRmxleENvbnRlbnQmKTsKLSAgICB2b2lkIGFsaWduRmxleEl0ZW1zKExv Z2ljYWxGbGV4SXRlbXMmLCBjb25zdCBDb25zdHJhaW50c0ZvckZsZXhDb250ZW50Jik7CisgICAg dm9pZCBjb21wdXRlTG9naWNhbEhlaWdodEZvckZsZXhJdGVtcyhMb2dpY2FsRmxleEl0ZW1zJiwg TGF5b3V0VW5pdCBhdmFpbGFibGVTcGFjZSk7CisgICAgdm9pZCBhbGlnbkZsZXhJdGVtcyhMb2dp Y2FsRmxleEl0ZW1zJiwgTGF5b3V0VW5pdCBhdmFpbGFibGVTcGFjZSk7CisgICAgTGF5b3V0VW5p dCBjb21wdXRlQXZhaWxhYmxlTG9naWNhbFZlcnRpY2FsU3BhY2UoTG9naWNhbEZsZXhJdGVtcyYs IGNvbnN0IENvbnN0cmFpbnRzRm9yRmxleENvbnRlbnQmKSBjb25zdDsKKyAgICBMYXlvdXRVbml0 IGNvbXB1dGVBdmFpbGFibGVMb2dpY2FsSG9yaXpvbnRhbFNwYWNlKExvZ2ljYWxGbGV4SXRlbXMm LCBjb25zdCBDb25zdHJhaW50c0ZvckZsZXhDb250ZW50JikgY29uc3Q7CiAKICAgICBjb25zdCBG bGV4Rm9ybWF0dGluZ1N0YXRlJiBmb3JtYXR0aW5nU3RhdGUoKSBjb25zdCB7IHJldHVybiBkb3du Y2FzdDxGbGV4Rm9ybWF0dGluZ1N0YXRlPihGb3JtYXR0aW5nQ29udGV4dDo6Zm9ybWF0dGluZ1N0 YXRlKCkpOyB9CiAgICAgRmxleEZvcm1hdHRpbmdTdGF0ZSYgZm9ybWF0dGluZ1N0YXRlKCkgeyBy ZXR1cm4gZG93bmNhc3Q8RmxleEZvcm1hdHRpbmdTdGF0ZT4oRm9ybWF0dGluZ0NvbnRleHQ6OmZv cm1hdHRpbmdTdGF0ZSgpKTsgfQotLSAKMi4zMi4wIChBcHBsZSBHaXQtMTMyKQoK